From 57589fc83c184dbf226ecb7bf1e5c85b2944cc0b Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 1 Oct 2016 11:06:11 +0200 Subject: [PATCH] yWeb: replace hardcoded paths (/var/httpd -> %(PUBLIC_HTTPDDIR)) Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/d5e62bd3791d4f00a28550f33325db050859b787 Author: vanhofen Date: 2016-10-01 (Sat, 01 Oct 2016) Origin message was: ------------------ - yWeb: replace hardcoded paths (/var/httpd -> %(PUBLIC_HTTPDDIR)) --- src/nhttpd/web/Makefile.am | 1 + src/nhttpd/web/Y_About.yhtm | 2 +- src/nhttpd/web/Y_Ext_Menue.yhtm | 2 +- src/nhttpd/web/Y_Ext_Settings.yhtm | 2 +- src/nhttpd/web/Y_Menue.yhtm | 2 +- src/nhttpd/web/Y_Settings_Timer.yhtm | 2 +- src/nhttpd/web/extentions/boxinfo/install.sh | 2 +- src/nhttpd/web/extentions/boxinfo/uninstall.sh | 2 +- src/nhttpd/web/extentions/hddtools/install.sh | 2 +- src/nhttpd/web/extentions/hddtools/uninstall.sh | 2 +- 10 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/nhttpd/web/Makefile.am b/src/nhttpd/web/Makefile.am index 86dd57c8c..1b5bc73c7 100644 --- a/src/nhttpd/web/Makefile.am +++ b/src/nhttpd/web/Makefile.am @@ -106,5 +106,6 @@ install-data-hook: sed -i \ -e 's|%(CONFIGDIR)|$(CONFIGDIR)|g' \ -e 's|%(PLUGINDIR_VAR)|$(PLUGINDIR_VAR)|g' \ + -e 's|%(PUBLIC_HTTPDDIR)|$(PUBLIC_HTTPDDIR)|g' \ ; diff --git a/src/nhttpd/web/Y_About.yhtm b/src/nhttpd/web/Y_About.yhtm index f782c3ce6..d001e174d 100644 --- a/src/nhttpd/web/Y_About.yhtm +++ b/src/nhttpd/web/Y_About.yhtm @@ -1,7 +1,7 @@ {=var-set:cancache=yPConf=} {=include-block:Y_Blocks.txt;head=} -{=var-set:alt_httpd={=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.override_directory;/var/httpd=}=} +{=var-set:alt_httpd={=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.override_directory;%(PUBLIC_HTTPDDIR)=}=} {=var-set:vf={=if-file-exists:{=var-get:alt_httpd=}/Y_Version.txt~{=var-get:alt_httpd=}/Y_Version.txt~Y_Version.txt=}=}
diff --git a/src/nhttpd/web/Y_Ext_Menue.yhtm b/src/nhttpd/web/Y_Ext_Menue.yhtm index 4f48fefd2..cbba90c12 100644 --- a/src/nhttpd/web/Y_Ext_Menue.yhtm +++ b/src/nhttpd/web/Y_Ext_Menue.yhtm @@ -1,4 +1,4 @@ -{=var-set:extension={=if-file-exists:%(CONFIGDIR)/extentions.txt~%(CONFIGDIR)/extentions.txt~{=if-file-exists:/var/httpd/extentions.txt~/var/httpd/extentions.txt~/share/tuxbox/neutrino/httpd/extentions.txt=}=}=} +{=var-set:extension={=if-file-exists:%(CONFIGDIR)/extentions.txt~%(CONFIGDIR)/extentions.txt~{=if-file-exists:%(PUBLIC_HTTPDDIR)/extentions.txt~%(PUBLIC_HTTPDDIR)/extentions.txt~/share/tuxbox/neutrino/httpd/extentions.txt=}=}=} {=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip2=}~1~=}=} {=include-block:Y_Blocks.txt;head=} diff --git a/src/nhttpd/web/Y_Ext_Settings.yhtm b/src/nhttpd/web/Y_Ext_Settings.yhtm index c013bb0a6..160b053a2 100644 --- a/src/nhttpd/web/Y_Ext_Settings.yhtm +++ b/src/nhttpd/web/Y_Ext_Settings.yhtm @@ -23,7 +23,7 @@ function do_submit(){ - +
 

diff --git a/src/nhttpd/web/Y_Menue.yhtm b/src/nhttpd/web/Y_Menue.yhtm index 55b7479b7..7263711a8 100644 --- a/src/nhttpd/web/Y_Menue.yhtm +++ b/src/nhttpd/web/Y_Menue.yhtm @@ -80,7 +80,7 @@ function vlc() { } -{=var-set:alt_httpd={=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.override_directory;/var/httpd=}=} +{=var-set:alt_httpd={=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.override_directory;%(PUBLIC_HTTPDDIR)=}=} {=var-set:vf={=if-file-exists:{=var-get:alt_httpd=}/Y_Version.txt~{=var-get:alt_httpd=}/Y_Version.txt~Y_Version.txt=}=}
diff --git a/src/nhttpd/web/Y_Settings_Timer.yhtm b/src/nhttpd/web/Y_Settings_Timer.yhtm index 942534ede..b63b125a9 100644 --- a/src/nhttpd/web/Y_Settings_Timer.yhtm +++ b/src/nhttpd/web/Y_Settings_Timer.yhtm @@ -50,7 +50,7 @@ function do_submit() {   - +
diff --git a/src/nhttpd/web/extentions/boxinfo/install.sh b/src/nhttpd/web/extentions/boxinfo/install.sh index c7ad7cff2..e72827acf 100755 --- a/src/nhttpd/web/extentions/boxinfo/install.sh +++ b/src/nhttpd/web/extentions/boxinfo/install.sh @@ -19,7 +19,7 @@ yI_Version="$Revision: 1.3 $" y_path_usrbin="/var/bin" y_path_config="%(CONFIGDIR)" y_path_tmp="/tmp" -y_ywebover_dir="/var/httpd" +y_ywebover_dir="%(PUBLIC_HTTPDDIR)" y_ext_conf_dir="$y_path_config/ext" # ----------------------------------------------------------- diff --git a/src/nhttpd/web/extentions/boxinfo/uninstall.sh b/src/nhttpd/web/extentions/boxinfo/uninstall.sh index 3d42cc605..f33ca7680 100755 --- a/src/nhttpd/web/extentions/boxinfo/uninstall.sh +++ b/src/nhttpd/web/extentions/boxinfo/uninstall.sh @@ -19,7 +19,7 @@ yI_Version="$Revision: 1.4 $" y_path_usrbin="/var/bin" y_path_config="%(CONFIGDIR)" y_path_tmp="/tmp" -y_ywebover_dir="/var/httpd" +y_ywebover_dir="%(PUBLIC_HTTPDDIR)" y_ext_conf_dir="$y_path_config/ext" # ----------------------------------------------------------- diff --git a/src/nhttpd/web/extentions/hddtools/install.sh b/src/nhttpd/web/extentions/hddtools/install.sh index c7ad7cff2..e72827acf 100755 --- a/src/nhttpd/web/extentions/hddtools/install.sh +++ b/src/nhttpd/web/extentions/hddtools/install.sh @@ -19,7 +19,7 @@ yI_Version="$Revision: 1.3 $" y_path_usrbin="/var/bin" y_path_config="%(CONFIGDIR)" y_path_tmp="/tmp" -y_ywebover_dir="/var/httpd" +y_ywebover_dir="%(PUBLIC_HTTPDDIR)" y_ext_conf_dir="$y_path_config/ext" # ----------------------------------------------------------- diff --git a/src/nhttpd/web/extentions/hddtools/uninstall.sh b/src/nhttpd/web/extentions/hddtools/uninstall.sh index 3d42cc605..f33ca7680 100755 --- a/src/nhttpd/web/extentions/hddtools/uninstall.sh +++ b/src/nhttpd/web/extentions/hddtools/uninstall.sh @@ -19,7 +19,7 @@ yI_Version="$Revision: 1.4 $" y_path_usrbin="/var/bin" y_path_config="%(CONFIGDIR)" y_path_tmp="/tmp" -y_ywebover_dir="/var/httpd" +y_ywebover_dir="%(PUBLIC_HTTPDDIR)" y_ext_conf_dir="$y_path_config/ext" # -----------------------------------------------------------