From 1aa1ac31b1c815d25169d0270f668a86bb57c9e7 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Fri, 26 Jun 2020 19:49:25 +0000 Subject: [PATCH] busybox: remove webserver Signed-off-by: Ian Leonard --- .../busybox/config/busybox-target.conf | 26 +++++------ packages/sysutils/busybox/config/httpd.conf | 46 ------------------- packages/sysutils/busybox/package.mk | 8 ---- 3 files changed, 13 insertions(+), 67 deletions(-) delete mode 100644 packages/sysutils/busybox/config/httpd.conf diff --git a/packages/sysutils/busybox/config/busybox-target.conf b/packages/sysutils/busybox/config/busybox-target.conf index 6fbc442f6d..95eb3020cd 100644 --- a/packages/sysutils/busybox/config/busybox-target.conf +++ b/packages/sysutils/busybox/config/busybox-target.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.32.0.git -# Sun Feb 2 19:50:40 2020 +# Fri Jun 26 19:45:09 2020 # CONFIG_HAVE_DOT_CONFIG=y @@ -857,18 +857,18 @@ CONFIG_FTPPUT=y CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y CONFIG_HOSTNAME=y CONFIG_DNSDOMAINNAME=y -CONFIG_HTTPD=y -CONFIG_FEATURE_HTTPD_RANGES=y -CONFIG_FEATURE_HTTPD_SETUID=y -CONFIG_FEATURE_HTTPD_BASIC_AUTH=y -CONFIG_FEATURE_HTTPD_AUTH_MD5=y -CONFIG_FEATURE_HTTPD_CGI=y -CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y -CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y -CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y -CONFIG_FEATURE_HTTPD_ERROR_PAGES=y -CONFIG_FEATURE_HTTPD_PROXY=y -CONFIG_FEATURE_HTTPD_GZIP=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_RANGES is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set +# CONFIG_FEATURE_HTTPD_PROXY is not set +# CONFIG_FEATURE_HTTPD_GZIP is not set CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y # CONFIG_FEATURE_IFCONFIG_SLIP is not set diff --git a/packages/sysutils/busybox/config/httpd.conf b/packages/sysutils/busybox/config/httpd.conf deleted file mode 100644 index 152343e657..0000000000 --- a/packages/sysutils/busybox/config/httpd.conf +++ /dev/null @@ -1,46 +0,0 @@ -# httpd.conf has the following format: -# -# H:/serverroot # define the server root. It will override -h -# A:172.20. # Allow address from 172.20.0.0/16 -# A:10.0.0.0/25 # Allow any address from 10.0.0.0-10.0.0.127 -# A:10.0.0.0/255.255.255.128 # Allow any address that previous set -# A:127.0.0.1 # Allow local loopback connections -# D:* # Deny from other IP connections -# E404:/path/e404.html # /path/e404.html is the 404 (not found) error page -# I:index.html # Show index.html when a directory is requested -# -# P:/url:[http://]hostname[:port]/new/path -# # When /urlXXXXXX is requested, reverse proxy -# # it to http://hostname[:port]/new/pathXXXXXX -# -# /cgi-bin:foo:bar # Require user foo, pwd bar on urls starting with /cgi-bin/ -# /adm:admin:setup # Require user admin, pwd setup on urls starting with /adm/ -# /adm:toor:PaSsWd # or user toor, pwd PaSsWd on urls starting with /adm/ -# .au:audio/basic # additional mime type for audio.au files -# *.php:/path/php # run xxx.php through an interpreter -# -# A/D may be as a/d or allow/deny - only first char matters. -# Deny/Allow IP logic: -# - Default is to allow all (Allow all (A:*) is a no-op). -# - Deny rules take precedence over allow rules. -# - "Deny all" rule (D:*) is applied last. -# -# Example: -# 1. Allow only specified addresses -# A:172.20 # Allow any address that begins with 172.20. -# A:10.10. # Allow any address that begins with 10.10. -# A:127.0.0.1 # Allow local loopback connections -# D:* # Deny from other IP connections -# -# 2. Only deny specified addresses -# D:1.2.3. # deny from 1.2.3.0 - 1.2.3.255 -# D:2.3.4. # deny from 2.3.4.0 - 2.3.4.255 -# A:* # (optional line added for clarity) -# - -H:/usr/www # define the server root. It will override -h -A:* # Allow address from all ip's -E404:/usr/www/error/404.html # /path/e404.html is the 404 (not found) error page -I:index.html # Show index.html when a directory is requested - -*.php:/usr/bin/php-cgi \ No newline at end of file diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk index e6e8271860..46d039a415 100644 --- a/packages/sysutils/busybox/package.mk +++ b/packages/sysutils/busybox/package.mk @@ -146,7 +146,6 @@ makeinstall_target() { mkdir -p $INSTALL/etc cp $PKG_DIR/config/profile $INSTALL/etc cp $PKG_DIR/config/inputrc $INSTALL/etc - cp $PKG_DIR/config/httpd.conf $INSTALL/etc cp $PKG_DIR/config/suspend-modules.conf $INSTALL/etc # /etc/fstab is needed by... @@ -160,13 +159,6 @@ makeinstall_target() { # create /etc/hostname ln -sf /proc/sys/kernel/hostname $INSTALL/etc/hostname - - # add webroot - mkdir -p $INSTALL/usr/www - echo "It works" > $INSTALL/usr/www/index.html - - mkdir -p $INSTALL/usr/www/error - echo "404" > $INSTALL/usr/www/error/404.html } post_install() {