diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-10 12:32:29 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-10 12:32:29 +0000 |
commit | 9c8997d54dc9df184bfcedeabf0b3c85cf5e6753 (patch) | |
tree | 46b83031a0da1b4458317413c00d13c252c72afa /package/uhttpd/files | |
parent | eecf5b17520f6b3b6ffb45ac7dca298d93b27501 (diff) |
packages: sort network related packages into package/network/
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33688 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/uhttpd/files')
-rw-r--r-- | package/uhttpd/files/uhttpd.config | 89 | ||||
-rwxr-xr-x | package/uhttpd/files/uhttpd.init | 135 |
2 files changed, 0 insertions, 224 deletions
diff --git a/package/uhttpd/files/uhttpd.config b/package/uhttpd/files/uhttpd.config deleted file mode 100644 index b33411e97..000000000 --- a/package/uhttpd/files/uhttpd.config +++ /dev/null @@ -1,89 +0,0 @@ -# Server configuration -config uhttpd main - - # HTTP listen addresses, multiple allowed - list listen_http 0.0.0.0:80 -# list listen_http [::]:80 - - # HTTPS listen addresses, multiple allowed - list listen_https 0.0.0.0:443 -# list listen_https [::]:443 - - # Server document root - option home /www - - # Reject requests from RFC1918 IP addresses - # directed to the servers public IP(s). - # This is a DNS rebinding countermeasure. - option rfc1918_filter 1 - - # Maximum number of concurrent requests. - # If this number is exceeded, further requests are - # queued until the number of running requests drops - # below the limit again. - option max_requests 3 - - # Certificate and private key for HTTPS. - # If no listen_https addresses are given, - # the key options are ignored. - option cert /etc/uhttpd.crt - option key /etc/uhttpd.key - - # CGI url prefix, will be searched in docroot. - # Default is /cgi-bin - option cgi_prefix /cgi-bin - - # List of extension->interpreter mappings. - # Files with an associated interpreter can - # be called outside of the CGI prefix and do - # not need to be executable. -# list interpreter ".php=/usr/bin/php-cgi" -# list interpreter ".cgi=/usr/bin/perl" - - # Lua url prefix and handler script. - # Lua support is disabled if no prefix given. -# option lua_prefix /luci -# option lua_handler /usr/lib/lua/luci/sgi/uhttpd.lua - - # CGI/Lua timeout, if the called script does not - # write data within the given amount of seconds, - # the server will terminate the request with - # 504 Gateway Timeout response. - option script_timeout 60 - - # Network timeout, if the current connection is - # blocked for the specified amount of seconds, - # the server will terminate the associated - # request process. - option network_timeout 30 - - # TCP Keep-Alive, send periodic keep-alive probes - # over established connections to detect dead peers. - # The value is given in seconds to specify the - # interval between subsequent probes. - # Setting this to 0 will disable TCP keep-alive. - option tcp_keepalive 1 - - # Basic auth realm, defaults to local hostname -# option realm OpenWrt - - # Configuration file in busybox httpd format -# option config /etc/httpd.conf - - -# Certificate defaults for px5g key generator -config cert px5g - - # Validity time - option days 730 - - # RSA key size - option bits 1024 - - # Location - option country DE - option state Berlin - option location Berlin - - # Common name - option commonname OpenWrt diff --git a/package/uhttpd/files/uhttpd.init b/package/uhttpd/files/uhttpd.init deleted file mode 100755 index 379a9f5b5..000000000 --- a/package/uhttpd/files/uhttpd.init +++ /dev/null @@ -1,135 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2010 Jo-Philipp Wich - -START=50 - -SERVICE_DAEMONIZE=1 -SERVICE_WRITE_PID=1 - -UHTTPD_BIN="/usr/sbin/uhttpd" -PX5G_BIN="/usr/sbin/px5g" - -append_arg() { - local cfg="$1" - local var="$2" - local opt="$3" - local def="$4" - local val - - config_get val "$cfg" "$var" - [ -n "$val" -o -n "$def" ] && append UHTTPD_ARGS "$opt ${val:-$def}" -} - -append_bool() { - local cfg="$1" - local var="$2" - local opt="$3" - local def="$4" - local val - - config_get_bool val "$cfg" "$var" "$def" - [ "$val" = 1 ] && append UHTTPD_ARGS "$opt" -} - -generate_keys() { - local cfg="$1" - local key="$2" - local crt="$3" - local days bits country state location commonname - - config_get days "$cfg" days - config_get bits "$cfg" bits - config_get country "$cfg" country - config_get state "$cfg" state - config_get location "$cfg" location - config_get commonname "$cfg" commonname - - [ -x "$PX5G_BIN" ] && { - $PX5G_BIN selfsigned -der \ - -days ${days:-730} -newkey rsa:${bits:-1024} -keyout "$UHTTPD_KEY" -out "$UHTTPD_CERT" \ - -subj /C="${country:-DE}"/ST="${state:-Saxony}"/L="${location:-Leipzig}"/CN="${commonname:-OpenWrt}" - } -} - -start_instance() -{ - UHTTPD_ARGS="" - UHTTPD_CERT="" - UHTTPD_KEY="" - - local cfg="$1" - local realm="$(uci_get system.@system[0].hostname)" - local listen http https interpreter path - - append_arg "$cfg" home "-h" - append_arg "$cfg" realm "-r" "${realm:-OpenWrt}" - append_arg "$cfg" config "-c" - append_arg "$cfg" cgi_prefix "-x" - append_arg "$cfg" lua_prefix "-l" - append_arg "$cfg" lua_handler "-L" - append_arg "$cfg" script_timeout "-t" - append_arg "$cfg" network_timeout "-T" - append_arg "$cfg" tcp_keepalive "-A" - append_arg "$cfg" error_page "-E" - append_arg "$cfg" index_page "-I" - append_arg "$cfg" max_requests "-n" 3 - - append_bool "$cfg" no_symlinks "-S" 0 - append_bool "$cfg" no_dirlists "-D" 0 - append_bool "$cfg" rfc1918_filter "-R" 0 - - config_get http "$cfg" listen_http - for listen in $http; do - append UHTTPD_ARGS "-p $listen" - done - - config_get interpreter "$cfg" interpreter - for path in $interpreter; do - append UHTTPD_ARGS "-i $path" - done - - config_get https "$cfg" listen_https - config_get UHTTPD_KEY "$cfg" key /etc/uhttpd.key - config_get UHTTPD_CERT "$cfg" cert /etc/uhttpd.crt - - [ -n "$https" ] && { - [ -f "$UHTTPD_CERT" -a -f "$UHTTPD_KEY" ] || { - config_foreach generate_keys cert - } - - [ -f "$UHTTPD_CERT" -a -f "$UHTTPD_KEY" ] && { - append_arg "$cfg" cert "-C" - append_arg "$cfg" key "-K" - - for listen in $https; do - append UHTTPD_ARGS "-s $listen" - done - } - } - - SERVICE_PID_FILE=/var/run/uhttpd_${cfg}.pid - service_start $UHTTPD_BIN -f $UHTTPD_ARGS - - # Check if daemon is running, if not then - # re-execute in foreground to display error. - sleep 1 && service_check $UHTTPD_BIN || \ - $UHTTPD_BIN -f $UHTTPD_ARGS -} - -stop_instance() -{ - local cfg="$1" - - SERVICE_PID_FILE=/var/run/uhttpd_${cfg}.pid - service_stop $UHTTPD_BIN -} - -start() { - config_load uhttpd - config_foreach start_instance uhttpd -} - -stop() { - config_load uhttpd - config_foreach stop_instance uhttpd -} |