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: re-introduce 'WebsiteMain.hosted_directory'

Browse Source 
* this directory can be used to host some of your cracy stuff.
  yhtm, yjs and ysh will also parsed now. it is reachable with
  <boxip>/hosted/
* if exist a subdir named 'logos' in this directory you can use
  this as an external logo-dir for yweb too
* path can be configured with '--with-hosted_httpddir=PATH'
This commit is contained in:
svenhoefer
2013-06-27 12:20:29 +02:00
parent ac53313da4
commit 9078775a0a
12 changed files with 59 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nhttpd/web/Y_Blocks.txt
View File

@@ -53,7 +53,7 @@ start-block~nhttpd_save_settings
{=ini-set:/var/tuxbox/config/nhttpd.conf;WebsiteMain.port;{=port=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;webserver.threading;{=threading=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;server.no_keep-alive_ips;{=no_keep_alive_ips=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;WebsiteMain.hosted_directory;{=HostedDocRoot=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;WebsiteMain.hosted_directory;{=hosted_directory=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;WebsiteMain.override_directory;{=override_directory=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;mod_sendfile.mime_types;{=mod_sendfile_mime_types=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;mod_sendfile.sendAll;{=mod_sendfile_sendAll=}~cache=}

13
src/nhttpd/web/Y_Settings_nhttpd.yhtm
View File

@@ -62,7 +62,7 @@ function do_submit()
</tr>
<tr>
<td>{=L:set.nhttpd.port=}</td>
<td><input type="text" name="port" size="20" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.port;80~cache=}" title="{=L:port=}"/>&nbsp;{=L:active_after_boot=}
<td><input type="text" name="port" size="20" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.port;80~cache=}" title="{=L:set.nhttpd.port=}"/>&nbsp;{=L:set.nhttpd.active_after_boot=}
</td>
</tr>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
@@ -76,8 +76,15 @@ function do_submit()
=}
<tr>
<td>{=L:set.nhttpd.alternate_web_folder=}</td>
<td><input type="text" name="override_directory" size="20" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.override_directory~cache=}" title="{=L:alternate_web_folder=}"/>&nbsp;{=L:active_after_boot=}
<input type="hidden" name="HostedDocRoot" size="60" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.hosted_directory~cache=}" title="Root of hosted Web. Enter mount directory."/></td>
<td>
<input type="text" name="override_directory" size="20" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.override_directory~cache=}" title="{=L:set.nhttpd.alternate_web_folder=}"/>&nbsp;{=L:set.nhttpd.active_after_boot=}
</td>
</tr>
<tr>
<td>{=L:set.nhttpd.hosted_folder=}</td>
<td>
<input type="text" name="hosted_directory" size="20" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.hosted_directory~cache=}" title="Root of hosted Web. Enter mount directory."/>&nbsp;{=L:set.nhttpd.active_after_boot=}
</td>
</tr>
<tr>
<td>{=L:set.nhttpd.allowed_file_extensions=}</td>

1
src/nhttpd/web/languages/Deutsch
View File

@@ -303,6 +303,7 @@ set.nhttpd.active_after_boot=Nach Neustart aktiv
set.nhttpd.port=Port
set.nhttpd.threading=Threading
set.nhttpd.alternate_web_folder=Alternativer Web-Ordner
set.nhttpd.hosted_folder=Eingebundenes Verzeichnis
set.nhttpd.allowed_file_extensions=Erlaubte Dateiendungen / MIME
set.nhttpd.allow_all_file_extensions=Alle Dateiendungen erlauben
set.nhttpd.url_of_logos_desc=URL bzw. Verzeichnis der Logos eingeben

1
src/nhttpd/web/languages/English
View File

@@ -306,6 +306,7 @@ set.nhttpd.active_after_boot=active after boot
set.nhttpd.port=Port
set.nhttpd.threading=Threading
set.nhttpd.alternate_web_folder=Alternate Web-Folder
set.nhttpd.hosted_folder=Mounted directory
set.nhttpd.allowed_file_extensions=Allowed File Extensions / MIME
set.nhttpd.allow_all_file_extensions=Allow all File Extensions
set.nhttpd.url_of_logos_desc=Enter URL or directory of Logos