Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 803ccb993a7e81e594428a724e9e1b4584bdf60f (commit)
from 877c1529f160f5ff5b166ee0b2309ef328c2a01f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 803ccb993a7e81e594428a724e9e1b4584bdf60f
Author: GetAway <get-a...@t-online.de>
Date: Tue Mar 17 11:07:48 2015 +0100
yWeb: fix hardcoded paths
Signed-off-by: GetAway <get-a...@t-online.de>
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
index d6f825b..123dc80 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
@@ -535,14 +535,14 @@ void CControlAPI::SettingsCGI(CyhookHandler *hh)
// send services.xml
void CControlAPI::GetServicesxmlCGI(CyhookHandler *hh)
{
- hh->SendFile("/var/tuxbox/config/zapit/services.xml");
+ hh->SendFile(CONFIGDIR "/zapit/services.xml");
}
//-----------------------------------------------------------------------------
// send bouquets.xml
void CControlAPI::GetBouquetsxmlCGI(CyhookHandler *hh)
{
- hh->SendFile("/var/tuxbox/config/zapit/bouquets.xml");
+ hh->SendFile(CONFIGDIR "/zapit/bouquets.xml");
}
//-----------------------------------------------------------------------------
diff --git a/tuxbox/neutrino/daemons/nhttpd/yconfig.h
b/tuxbox/neutrino/daemons/nhttpd/yconfig.h
index ce688ac..bdd25c8 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yconfig.h
+++ b/tuxbox/neutrino/daemons/nhttpd/yconfig.h
@@ -156,7 +156,7 @@
#define HTTPD_NAME "nhttpd"
#define HTTPD_STANDARD_PORT 80
#define HTTPD_MAX_CONNECTIONS 10
-#define HTTPD_CONFIGDIR "/var/tuxbox/config"
+#define HTTPD_CONFIGDIR CONFIGDIR
#define HTTPD_CONFIGFILE HTTPD_CONFIGDIR "/nhttpd.conf"
#define HTTPD_REQUEST_LOG "/tmp/httpd_log"
#define HTTPD_ERRORPAGE "/Y_ErrorPage.yhtm"
@@ -165,13 +165,13 @@
#define AUTHUSER "root"
#define AUTHPASSWORD "dbox2"
-#define PRIVATEDOCUMENTROOT "/share/tuxbox/neutrino/httpd-y"
+#define PRIVATEDOCUMENTROOT DATADIR "/neutrino/httpd-y"
#define PUBLICDOCUMENTROOT "/var/httpd"
-#define NEUTRINO_CONFIGFILE "/var/tuxbox/config/neutrino.conf"
+#define NEUTRINO_CONFIGFILE CONFIGDIR "/neutrino.conf"
#define HOSTEDDOCUMENTROOT "/mnt/hosted"
#define EXTRASDOCUMENTROOT "/mnt/hosted/extras"
#define EXTRASDOCUMENTURL "/hosted/extras"
-#define ZAPITXMLPATH "/var/tuxbox/config/zapit"
+#define ZAPITXMLPATH CONFIGDIR "/zapit"
#define SSL_PEMFILE HTTPD_CONFIGDIR "/server.pem"
#define SSL_CA_FILE HTTPD_CONFIGDIR "/cacert.pem"
diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_yparser.cpp
b/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_yparser.cpp
index 198eb71..788b6d4 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_yparser.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_yparser.cpp
@@ -3,6 +3,8 @@
// yParser
//=============================================================================
// C
+#include <config.h>
+
#include <cstdlib>
#include <cstring>
#include <stdio.h>
-----------------------------------------------------------------------
Summary of changes:
.../daemons/nhttpd/tuxboxapi/controlapi.cpp | 4 ++--
tuxbox/neutrino/daemons/nhttpd/yconfig.h | 8 ++++----
.../daemons/nhttpd/yhttpd_mods/mod_yparser.cpp | 2 ++
3 files changed, 8 insertions(+), 6 deletions(-)
--
Tuxbox-GIT: apps
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Tuxbox-cvs-commits mailing list
Tuxbox-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tuxbox-cvs-commits
