summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2018-02-07 20:35:47 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2018-02-07 20:35:47 +0000
commita6c5cef5f2982167988c522ec836f5dcb45e55f6 (patch)
tree76c40a233fb67ced6b50f1da98d862cbf58a8e86
parentcgitrc (diff)
downloadconfig-a6c5cef5f2982167988c522ec836f5dcb45e55f6.tar.bz2
config-a6c5cef5f2982167988c522ec836f5dcb45e55f6.tar.xz
config-a6c5cef5f2982167988c522ec836f5dcb45e55f6.zip
Changes implementing HA Proxy for Apache
-rw-r--r--etc/apache/httpd.conf21
1 files changed, 15 insertions, 6 deletions
diff --git a/etc/apache/httpd.conf b/etc/apache/httpd.conf
index 10fddfd..3b8e25f 100644
--- a/etc/apache/httpd.conf
+++ b/etc/apache/httpd.conf
@@ -4,16 +4,16 @@ ServerAdmin dan.goodliffe@randomdan.homeip.net
PidFile /var/run/apache2.pid
ErrorLog /var/log/apache2/error.log
-LogFormat "%V %h %l %u %t \"%r\" %>s %b %Dus" common
-LogFormat "%V %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" ncsa
+LogFormat "%V %a %l %u %t \"%r\" %>s %b %Dus" common
+LogFormat "%V %a %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" ncsa
CustomLog /var/log/apache2/access.log common
CustomLog /var/log/apache2/ncsa.log ncsa
LogLevel warn
User apache
Group web
-Listen 80
-Listen 443
+Listen 11080
+Listen 11443
Timeout 300
KeepAlive On
MaxKeepAliveRequests 100
@@ -53,6 +53,9 @@ LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
LoadModule http2_module modules/mod_http2.so
LoadModule headers_module modules/mod_headers.so
LoadModule expires_module modules/mod_expires.so
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+LoadModule proxy_protocol_module modules/mod_proxy_protocol.so
CacheRoot "/var/cache/apache2/"
CacheEnable disk /
@@ -63,6 +66,7 @@ ExpiresActive on
ExpiresByType image/png A86400
ExpiresByType text/css A86400
ExpiresByType application/x-javascript A86400
+ProxyProtocol on
<Directory />
Options FollowSymLinks Indexes ExecCGI
@@ -132,7 +136,12 @@ PerlSetVar JavaScriptMinifier JavaScript::Minifier::XS
PerlModule CGI
PerlSendHeader On
</VirtualHost>
-<VirtualHost *:443>
+<VirtualHost *:11080>
+ ServerName sys.randomdan.homeip.net
+ ProxyPass "/haproxy/" "http://virtualip.random.lan:9000/haproxy/"
+ ProxyPassReverse "/haproxy/" "http://virtualip.random.lan:9000/haproxy/"
+</VirtualHost>
+<VirtualHost *:11443>
ServerName gentoobrowse.randomdan.homeip.net
SSLEngine On
SSLCertificateFile /etc/letsencrypt/live/gentoobrowse.randomdan.homeip.net/cert.pem
@@ -140,7 +149,7 @@ PerlSetVar JavaScriptMinifier JavaScript::Minifier::XS
SSLCertificateChainFile /etc/letsencrypt/live/gentoobrowse.randomdan.homeip.net/chain.pem
Header always set Strict-Transport-Security "max-age=864000; includeSubDomains"
</VirtualHost>
-<VirtualHost *:443>
+<VirtualHost *:11443>
ServerName git.randomdan.homeip.net
SSLEngine On
SSLCertificateFile /etc/letsencrypt/live/git.randomdan.homeip.net/cert.pem