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

- yWeb: replace hardcoded paths (/share/tuxbox/neutrino/httpd -> %(PRIVATE_HTTPDDIR))

Browse Source
This commit is contained in:
svenhoefer
2016-10-01 11:06:11 +02:00
parent d5e62bd379
commit b5820837de
5 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,6 +106,7 @@ install-data-hook:
sed -i \ sed -i \
-e 's|%(CONFIGDIR)|$(CONFIGDIR)|g' \ -e 's|%(CONFIGDIR)|$(CONFIGDIR)|g' \
-e 's|%(PLUGINDIR_VAR)|$(PLUGINDIR_VAR)|g' \ -e 's|%(PLUGINDIR_VAR)|$(PLUGINDIR_VAR)|g' \
-e 's|%(PRIVATE_HTTPDDIR)|$(PRIVATE_HTTPDDIR)|g' \
-e 's|%(PUBLIC_HTTPDDIR)|$(PUBLIC_HTTPDDIR)|g' \ -e 's|%(PUBLIC_HTTPDDIR)|$(PUBLIC_HTTPDDIR)|g' \
; ;

2
src/nhttpd/web/Y_Ext_Menue.yhtm
View File

@@ -1,4 +1,4 @@
{=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:extension={=if-file-exists:%(CONFIGDIR)/extentions.txt~%(CONFIGDIR)/extentions.txt~{=if-file-exists:%(PUBLIC_HTTPDDIR)/extentions.txt~%(PUBLIC_HTTPDDIR)/extentions.txt~%(PRIVATE_HTTPDDIR)/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~=}=} {=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=} {=include-block:Y_Blocks.txt;head=}
<script type="text/javascript" src="/prototype.js"></script> <script type="text/javascript" src="/prototype.js"></script>

2
src/nhttpd/web/Y_Ext_Settings.yhtm
View File

@@ -23,7 +23,7 @@ function do_submit(){
<table border="0" class="y_form_table" cellspacing="0" cellpadding="0"> <table border="0" class="y_form_table" cellspacing="0" cellpadding="0">
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<td><textarea name="extentions" id="ext" cols="90" rows="30" title="extention list">{=if-file-exists:%(CONFIGDIR)/extentions.txt~{=include:%(CONFIGDIR)/extentions.txt=}~{=if-file-exists:%(PUBLIC_HTTPDDIR)/extentions.txt~{=include:%(PUBLIC_HTTPDDIR)/extentions.txt=}~{=include:/share/tuxbox/neutrino/httpd/extentions.txt=}=}=}</textarea></td> <td><textarea name="extentions" id="ext" cols="90" rows="30" title="extention list">{=if-file-exists:%(CONFIGDIR)/extentions.txt~{=include:%(CONFIGDIR)/extentions.txt=}~{=if-file-exists:%(PUBLIC_HTTPDDIR)/extentions.txt~{=include:%(PUBLIC_HTTPDDIR)/extentions.txt=}~{=include:%(PRIVATE_HTTPDDIR)/extentions.txt=}=}=}</textarea></td>
</tr> </tr>
</table> </table>
<br/> <br/>

2
src/nhttpd/web/Y_Settings_Timer.yhtm
View File

@@ -50,7 +50,7 @@ function do_submit() {
</tr> </tr>
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<td><textarea name="channels" cols="60" rows="10">{=if-file-exists:%(CONFIGDIR)/channels.txt~{=include:%(CONFIGDIR)/channels.txt=}~{=if-file-exists:%(PUBLIC_HTTPDDIR)/channels.txt~{=include:%(PUBLIC_HTTPDDIR)/channels.txt=}~{=include:/share/tuxbox/neutrino/httpd/channels.txt=}=}=}</textarea></td> <td><textarea name="channels" cols="60" rows="10">{=if-file-exists:%(CONFIGDIR)/channels.txt~{=include:%(CONFIGDIR)/channels.txt=}~{=if-file-exists:%(PUBLIC_HTTPDDIR)/channels.txt~{=include:%(PUBLIC_HTTPDDIR)/channels.txt=}~{=include:%(PRIVATE_HTTPDDIR)/channels.txt=}=}=}</textarea></td>
</tr> </tr>
</table> </table>
<br/> <br/>

2
src/nhttpd/web/scripts/_Y_Globals.sh
View File

@@ -13,7 +13,7 @@ boxtype="coolstream"
# ----------------------------------------------------------- # -----------------------------------------------------------
# Paths # Paths
# ----------------------------------------------------------- # -----------------------------------------------------------
#y_path_httpd="/share/tuxbox/neutrino/httpd-y" #y_path_httpd="%(PRIVATE_HTTPDDIR)"
y_path_httpd=".." y_path_httpd=".."
y_path_scripts="$y_path_httpd/scripts" y_path_scripts="$y_path_httpd/scripts"
y_path_usrbin="/var/bin" y_path_usrbin="/var/bin"