mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 01:11:06 +02:00
31c7317205
Conflicts:
src/gui/epgview.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 66adad0811
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)
------------------
This commit was generated by Migit
------------------------------------------------------------------------------ nhttpd Version 3.x = (yhttpd 3.x + tuxboxapi) ------------------------------------------------------------------------------ 25.02.2010 (yjogol) ------------------- C/C++ Coding-Style switched to GNU-Style All Files edited with Tab width = 4 13.09.2006 (yjogol) ------------------- Starting with Version 3.0 the nhttpd source code was splitted into a core Webserver (yhttpd_core), extension modules (yhttpd_mods) and the tuxbox specific code (tuxboxapi). The yhttpd_core and yhttp_mods are completly rewritten. All Neutrino specific code was reorganized into yParser- and ControlAPI-code. The Hook-System (extension modules) encapsulate all requests and responses for the tuxboxapi. So both tuxboxapi and yhttpd can be developed seperatlly and independ from each other. Look at yhttpd_core/README ------------------------------------------------------------------------------ nhttpd.conf Description ------------------------------------------------------------------------------ Language.directory=languages Language.selected=Deutsch Tuxbox.LogosURL= WebsiteMain.directory=/share/tuxbox/neutrino/httpd // Main HTML,Javascript, Images Directoty root (e.g. read-only area in mFlash) WebsiteMain.override_directory=/var/httpd // Override directory (writable) for extensions or Updates. Webserver first search here. WebsiteMain.port=80 // Port the webserver is running on WebsiteMain.hosted_directory=/mnt/hosted // our own directory hosted by the webserver. Adressable with <box ip>/hosted/<your files> configfile.version=4 // Version of this config file mod_auth.authenticate=false // ask for username/password (http digit authentication) mod_auth.no_auth_client= // IP Adress without http authentication mod_auth.password=coolstream mod_auth.username=root mod_cache.cache_directory=/tmp/.cache mod_sendfile.mime_types=htm:text/html,html:text/html,xml:text/xml,txt:text/plain,jpg:image/jpeg,jpeg:image/jpeg,gif:image/gif,png:image/png,bmp:image/bmp,css:text/css,js:text/plain,img:application/octet-stream,ico:image/x-icon,m3u:application/octet-stream,tar:application/octet-stream mod_weblog.log_format= mod_weblog.logfile=/tmp/yhhtpd.log server.chroot= server.group_name= server.log.loglevel=0 server.no_keep-alive_ips= server.user_name= webserver.threading=false webserver.websites=WebsiteMain // Dont change #if SSL compiled WebsiteMain.ssl=false WebsiteMain.ssl_pemfile WebsiteMain.ssl_ca_file