summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrad <brad@openbsd.org>2008-06-24 23:09:42 +0000
committerbrad <brad@openbsd.org>2008-06-24 23:09:42 +0000
commitf74c06e3c25bb4bfff34bd84b87f0b46240fdcbf (patch)
tree87148a91820815611ac0aeac42640e010920226c
parentFixed a problem that would cause errors (especially when in low memory (diff)
downloadwireguard-openbsd-f74c06e3c25bb4bfff34bd84b87f0b46240fdcbf.tar.xz
wireguard-openbsd-f74c06e3c25bb4bfff34bd84b87f0b46240fdcbf.zip
Garbage collect some unused nor relevant config files. They're either
empty stubs (access.conf-dist/srm.conf-dist) or poor example configs for "high performance" which users are much better served by actually reading the documentation and understanding what they're doing. ok deraadt@
-rw-r--r--usr.sbin/httpd/conf/access.conf-dist8
-rw-r--r--usr.sbin/httpd/conf/highperformance.conf-dist59
-rw-r--r--usr.sbin/httpd/conf/srm.conf-dist8
3 files changed, 0 insertions, 75 deletions
diff --git a/usr.sbin/httpd/conf/access.conf-dist b/usr.sbin/httpd/conf/access.conf-dist
deleted file mode 100644
index a38b11baced..00000000000
--- a/usr.sbin/httpd/conf/access.conf-dist
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is the default file for the AccessConfig directive in httpd.conf.
-# It is processed after httpd.conf and srm.conf.
-#
-# To avoid confusion, it is recommended that you put all of your
-# Apache server directives into the httpd.conf file and leave this
-# one essentially empty.
-#
diff --git a/usr.sbin/httpd/conf/highperformance.conf-dist b/usr.sbin/httpd/conf/highperformance.conf-dist
deleted file mode 100644
index 414d585b116..00000000000
--- a/usr.sbin/httpd/conf/highperformance.conf-dist
+++ /dev/null
@@ -1,59 +0,0 @@
-# Ha, you're reading this config file looking for the easy way out!
-# "how do I make my apache server go really really fast??"
-# Well you could start by reading the /manual/misc/perf-tuning.html
-# page. But, we'll give you a head start.
-#
-# This config file is small, it is probably not what you'd expect on a
-# full featured internet webserver with multiple users. But it's
-# probably a good starting point for any folks interested in testing
-# performance.
-#
-# To run this config you'll need to use something like:
-# httpd -f @@ServerRoot@@/conf/highperformance.conf
-
-Port 80
-ServerRoot @@ServerRoot@@
-DocumentRoot @@ServerRoot@@/htdocs
-MaxClients 150
-StartServers 5
-MinSpareServers 5
-MaxSpareServers 10
-# Assume no memory leaks at all
-MaxRequestsPerChild 0
-
-# Wide-open rlimits.
-MaxCPUPerChild 0
-MaxDATAPerChild 0
-MaxNOFILEPerChild 0
-MaxRSSPerChild 0
-MaxSTACKPerChild 0
-
-# this is a True Config File
-# see http://www.apache.org/info/three-config-files.html
-ResourceConfig /dev/null
-AccessConfig /dev/null
-
-# it's always nice to know the server has started
-ErrorLog logs/error_log
-
-# Some benchmarks require logging, which is a good requirement. Uncomment
-# this if you need logging.
-#TransferLog logs/access_log
-
-# Disable symlink protection and htaccess files, they chew far too much.
-<Directory />
- AllowOverride none
- Options FollowSymLinks
- # If this was a real internet server you'd probably want to
- # uncomment these:
- #order deny,allow
- #deny from all
-</Directory>
-
-# If this was a real internet server you'd probably want to uncomment this:
-#<Directory "@@ServerRoot@@/htdocs">
-# order allow,deny
-# allow from all
-#</Directory>
-
-# OK that's enough hints. Read the documentation if you want more.
diff --git a/usr.sbin/httpd/conf/srm.conf-dist b/usr.sbin/httpd/conf/srm.conf-dist
deleted file mode 100644
index 394b6fa64dd..00000000000
--- a/usr.sbin/httpd/conf/srm.conf-dist
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is the default file for the ResourceConfig directive in httpd.conf.
-# It is processed after httpd.conf but before access.conf.
-#
-# To avoid confusion, it is recommended that you put all of your
-# Apache server directives into the httpd.conf file and leave this
-# one essentially empty.
-#