mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-11 15:41:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: fix most hardcoded paths

Browse Source
This commit is contained in:
Stefan Seyfried
2013-03-10 02:01:52 +01:00
parent 49d9ebf833
commit ffd4daea7c
17 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
View File

@@ -516,14 +516,14 @@ void CControlAPI::GetTimeCGI(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");
}
//-----------------------------------------------------------------------------

12
src/nhttpd/yconfig.h
View File

@@ -101,26 +101,26 @@
#define HTTPD_DEFAULT_LANGUAGE "English"
#define AUTHUSER "root"
#define HTTPD_CONFIGDIR "/var/tuxbox/config"
#define HTTPD_CONFIGDIR CONFIGDIR
#define HTTPD_CONFIGFILE HTTPD_CONFIGDIR "/nhttpd.conf"
#define YWEB_CONFIGFILE HTTPD_CONFIGDIR "/Y-Web.conf"
#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 TUXBOX_LOGOS_URL "/usr/share/tuxbox/neutrino/icons/logos"
#define ZAPITXMLPATH CONFIGDIR "/zapit"
#define TUXBOX_LOGOS_URL DATADIR "/neutrino/icons/logos"
// switch for Box differences
#ifdef CONFIG_SYSTEM_TUXBOX
#define AUTHPASSWORD "dbox2"
#define PRIVATEDOCUMENTROOT "/share/tuxbox/neutrino/httpd-y"
#define PRIVATEDOCUMENTROOT DATADIR "/neutrino/httpd-y"
#endif
#ifdef CONFIG_SYSTEM_TUXBOX_COOLSTREAM
#define AUTHPASSWORD "coolstream"
#define PRIVATEDOCUMENTROOT "/share/tuxbox/neutrino/httpd"
#define PRIVATEDOCUMENTROOT DATADIR "/neutrino/httpd"
#undef Y_CONFIG_BUILD_AS_DAEMON // No Daemon
#endif
//-----------------------------------------------------------------------------

1
src/nhttpd/yhttpd_mods/Makefile.am
View File

@@ -1,4 +1,5 @@
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/src/zapit/include \
-I$(top_srcdir)/src \

2
src/nhttpd/yhttpd_mods/mod_yparser.cpp
View File

@@ -3,6 +3,8 @@
// yParser
//=============================================================================
// C
#include <config.h>
#include <cstdlib>
#include <cstring>
#include <stdio.h>