commit 3f0dd4b23e6abfc99081bf2c69d331a58d721380 Author: dsorber Date: Wed Feb 12 17:18:13 2014 -0500 The first step in moving to Apache 2.4 is renaming all of your site configs so that they end in ".conf". diff --git a/configs/apache/main b/configs/apache/main deleted file mode 100644 index bf6c032..0000000 --- a/configs/apache/main +++ /dev/null @@ -1,43 +0,0 @@ - - Redirect permanent / https://10.0.0.6 - - - - ServerAdmin webmaster@localhost - - DocumentRoot /var/www - - Options FollowSymLinks - AllowOverride None - - - Options Indexes FollowSymLinks MultiViews - AllowOverride None - Order allow,deny - Allow from all - - - Alias /htdocs /var/htdocs - - Order allow,deny - Allow from all - - - WSGIScriptAlias /bfcs /home/dsorber/bfcs/app.wsgi - - ErrorDocument 403 /error_pages/404.html - ErrorDocument 404 /error_pages/404.html - - ErrorLog ${APACHE_LOG_DIR}/error.log - - # Possible values include: debug, info, notice, warn, error, crit, - # alert, emerg. - LogLevel warn - - CustomLog ${APACHE_LOG_DIR}/access.log combined - SSLEngine On - SSLCertificateFile /etc/apache2/ssl/server.crt - SSLCertificateKeyFile /etc/apache2/ssl/server.key - SSLProtocol -all +TLSv1 - SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown - diff --git a/configs/apache/main.conf b/configs/apache/main.conf new file mode 100644 index 0000000..bf6c032 --- /dev/null +++ b/configs/apache/main.conf @@ -0,0 +1,43 @@ + + Redirect permanent / https://10.0.0.6 + + + + ServerAdmin webmaster@localhost + + DocumentRoot /var/www + + Options FollowSymLinks + AllowOverride None + + + Options Indexes FollowSymLinks MultiViews + AllowOverride None + Order allow,deny + Allow from all + + + Alias /htdocs /var/htdocs + + Order allow,deny + Allow from all + + + WSGIScriptAlias /bfcs /home/dsorber/bfcs/app.wsgi + + ErrorDocument 403 /error_pages/404.html + ErrorDocument 404 /error_pages/404.html + + ErrorLog ${APACHE_LOG_DIR}/error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog ${APACHE_LOG_DIR}/access.log combined + SSLEngine On + SSLCertificateFile /etc/apache2/ssl/server.crt + SSLCertificateKeyFile /etc/apache2/ssl/server.key + SSLProtocol -all +TLSv1 + SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown + diff --git a/configs/apache/stuff b/configs/apache/stuff deleted file mode 100644 index 9d9900b..0000000 --- a/configs/apache/stuff +++ /dev/null @@ -1,7 +0,0 @@ - - AuthType Digest - AuthName "stuff" - AuthDigestProvider file - AuthUserFile /home/dsorber/web_users - Require valid-user - diff --git a/configs/apache/stuff.conf b/configs/apache/stuff.conf new file mode 100644 index 0000000..9d9900b --- /dev/null +++ b/configs/apache/stuff.conf @@ -0,0 +1,7 @@ + + AuthType Digest + AuthName "stuff" + AuthDigestProvider file + AuthUserFile /home/dsorber/web_users + Require valid-user + diff --git a/configs/apache/trac b/configs/apache/trac deleted file mode 100644 index 9d01306..0000000 --- a/configs/apache/trac +++ /dev/null @@ -1,23 +0,0 @@ -WSGIScriptAlias /trac /home/dsorber/trac/projects/headquarters/trac.wsgi - - - WSGIApplicationGroup %{GLOBAL} - Order deny,allow - Allow from all - - - - AuthType Digest - AuthName "trac" - AuthDigestProvider file - AuthUserFile /home/dsorber/web_users - Require valid-user - - -Alias /trac/chrome/common /home/dsorber/trac/projects/headquarters/htdocs/common -Alias /trac/chrome/site /home/dsorber/trac/projects/headquarters/htdocs/site - - - Order allow,deny - Allow from all - diff --git a/configs/apache/trac.conf b/configs/apache/trac.conf new file mode 100644 index 0000000..9d01306 --- /dev/null +++ b/configs/apache/trac.conf @@ -0,0 +1,23 @@ +WSGIScriptAlias /trac /home/dsorber/trac/projects/headquarters/trac.wsgi + + + WSGIApplicationGroup %{GLOBAL} + Order deny,allow + Allow from all + + + + AuthType Digest + AuthName "trac" + AuthDigestProvider file + AuthUserFile /home/dsorber/web_users + Require valid-user + + +Alias /trac/chrome/common /home/dsorber/trac/projects/headquarters/htdocs/common +Alias /trac/chrome/site /home/dsorber/trac/projects/headquarters/htdocs/site + + + Order allow,deny + Allow from all + diff --git a/configs/apache/transmission b/configs/apache/transmission deleted file mode 100644 index 128e087..0000000 --- a/configs/apache/transmission +++ /dev/null @@ -1,10 +0,0 @@ -ProxyRequests Off - - AuthType Digest - AuthName "engine" - AuthDigestProvider file - AuthUserFile /home/dsorber/web_users - Require valid-user - ProxyPass http://10.0.0.6:9565/transmission - ProxyPassReverse http://10.0.0.6:9565/transmission - diff --git a/configs/apache/transmission.conf b/configs/apache/transmission.conf new file mode 100644 index 0000000..128e087 --- /dev/null +++ b/configs/apache/transmission.conf @@ -0,0 +1,10 @@ +ProxyRequests Off + + AuthType Digest + AuthName "engine" + AuthDigestProvider file + AuthUserFile /home/dsorber/web_users + Require valid-user + ProxyPass http://10.0.0.6:9565/transmission + ProxyPassReverse http://10.0.0.6:9565/transmission +