Configuring Apache

diff --git a/.etckeeper b/.etckeeper
index e2e81de2bef5b5c926a216c3fa0a6e7e5988cd91..a8f261d7817d8a2aeff03d35f7636d770259f784 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -73,6 +73,7 @@ maybe chmod 0644 'apache2/apache2.conf'
 maybe chmod 0755 'apache2/conf-available'
 maybe chmod 0644 'apache2/conf-available/apache2-doc.conf'
 maybe chmod 0644 'apache2/conf-available/charset.conf'
+maybe chmod 0644 'apache2/conf-available/custom-log.conf'
 maybe chmod 0644 'apache2/conf-available/javascript-common.conf'
 maybe chmod 0644 'apache2/conf-available/localized-error-pages.conf'
 maybe chmod 0644 'apache2/conf-available/other-vhosts-access-log.conf'

diff --git a/apache2/conf-available/custom-log.conf b/apache2/conf-available/custom-log.conf
new file mode 100644 (file)
index 0000000..bdf3893
--- /dev/null
+++ b/apache2/conf-available/custom-log.conf
@@ -0,0 +1,11 @@
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" \"%T\" \"%v\" \"%f\"" full
+LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" \"%T\" \"%v\" \"%f\"" full_combined
+
+<IfModule logio_module>
+       # You need to enable mod_logio.c to use %I and %O
+       LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"  \"%T\" \"%v\" \"%f\" %I %O" full_io
+       LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
+       LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" vhostio
+</IfModule>
+
+# vim: filetype=apache ts=4 sw=4 sts=4 sr noet

diff --git a/apache2/conf-available/other-vhosts-access-log.conf b/apache2/conf-available/other-vhosts-access-log.conf
index 9f7aecd000b92c85801e4785609e6666297ee004..2b76f4aec85b19329a89fa011353249affef6bb1 100644 (file)
--- a/apache2/conf-available/other-vhosts-access-log.conf
+++ b/apache2/conf-available/other-vhosts-access-log.conf
@@ -1,2 +1,4 @@
 # Define an access log for VirtualHosts that don't define their own logfile
-CustomLog ${APACHE_LOG_DIR}/other_vhosts_access.log vhost_combined
+CustomLog ${APACHE_LOG_DIR}/other_vhosts_access.log full_combined
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

diff --git a/apache2/conf-enabled/custom-log.conf b/apache2/conf-enabled/custom-log.conf
new file mode 120000 (symlink)
index 0000000..bc5fa0f
--- /dev/null
+++ b/apache2/conf-enabled/custom-log.conf
@@ -0,0 +1 @@
+../conf-available/custom-log.conf
\ No newline at end of file

diff --git a/apache2/mods-available/info.conf b/apache2/mods-available/info.conf
index cf79351ec684d675193ca9eb2b581f54a2c7f446..5c04ca23b91e62645cda28b072b67b70fa8ad9a9 100644 (file)
--- a/apache2/mods-available/info.conf
+++ b/apache2/mods-available/info.conf
@@ -4,6 +4,15 @@
 #
 <Location /server-info>
        SetHandler server-info
-       Require local
-       #Require ip 192.0.2.0/24
+        AuthName "Server Status Access"
+        AuthType Basic
+        AuthBasicProvider file
+        AuthUserFile /etc/apache2/info_users_passwd
+        <RequireAny>
+            Require local
+            Require valid-user
+        </RequireAny>
+
 </Location>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

diff --git a/apache2/mods-available/status.conf b/apache2/mods-available/status.conf
index cd7dd58884830befca556a5d133123d66c50a45c..1f8ea74dad149827a6d9aa0a1dc7c9221c19c2ee 100644 (file)
--- a/apache2/mods-available/status.conf
+++ b/apache2/mods-available/status.conf
@@ -4,8 +4,15 @@
 
 <Location /server-status>
        SetHandler server-status
-       Require local
-       #Require ip 192.0.2.0/24
+        AuthName "Server Status Access"
+        AuthType Basic
+        AuthBasicProvider file
+        AuthUserFile /etc/apache2/info_users_passwd
+        <RequireAny>
+            Require local
+            Require valid-user
+        </RequireAny>
+
 </Location>
 
 # Keep track of extended status information for each request
@@ -21,3 +28,5 @@ ExtendedStatus On
        # Show Proxy LoadBalancer status in mod_status
        ProxyStatus On
 </IfModule>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet