Commit ebf016bf authored by A. Wilcox's avatar A. Wilcox

Merge branch 'sysvinit/apache-config' into 'master'

Update apache config

See merge request !4
parents e9fcb569 da5732a2
Pipeline #698 passed with stage
in 1 second
......@@ -7,6 +7,7 @@ DocumentRoot "/srv/www/adelie/www"
<VirtualHost *:80>
ServerName www.adelielinux.org
CustomLog /var/log/apache2/access.adelie.http.log combined
</VirtualHost>
<VirtualHost *:443>
......@@ -17,11 +18,13 @@ DocumentRoot "/srv/www/adelie/www"
Header always set Strict-Transport-Security "max-age=15768000"
</IfModule>
ServerName www.adelielinux.org
CustomLog /var/log/apache2/access.adelie.https.log combined
</VirtualHost>
<VirtualHost *:80>
ServerName adelielinux.org
Redirect 301 / http://www.adelielinux.org/
CustomLog /var/log/apache2/access.adelie.http.log combined
</VirtualHost>
<VirtualHost *:443>
......@@ -30,4 +33,5 @@ DocumentRoot "/srv/www/adelie/www"
SSLCertificateChainFile /etc/ssl/adelie-ca.pem
ServerName adelielinux.org
Redirect 301 / https://www.adelielinux.org/
CustomLog /var/log/apache2/access.adelie.https.log combined
</VirtualHost>
<VirtualHost *:443>
SSLProxyEngine On
ProxyPreserveHost On
ProxyPass "/" "https://[2602:fe3d:0801::0005:0001]/"
ProxyPassReverse "/" "https://[2602:fe3d:0801::0005:0001]/"
ServerName bts.adelielinux.org
</VirtualHost>
<VirtualHost *:80>
RewriteEngine On
RewriteRule (.*) https://bts.adelielinux.org/$1 [R,L]
ServerName bts.adelielinux.org
</VirtualHost>
......@@ -10,9 +10,16 @@
DocumentRoot "/srv/www/adelie/static"
ServerName static.adelielinux.org
CustomLog /var/log/apache2/access.static.https.log combined
</VirtualHost>
<VirtualHost *:80>
<IfModule headers_module>
Header always set Access-Control-Allow-Origin "*"
Header always set Cache-Control "max-age=31536000, immutable"
</IfModule>
DocumentRoot "/srv/www/adelie/static"
ServerName static.adelielinux.org
CustomLog /var/log/apache2/access.static.http.log combined
</VirtualHost>
......@@ -15,10 +15,17 @@
DocumentRoot "/srv/www/adelie/support"
ServerName help.adelielinux.org
ServerAlias support.adelielinux.org
CustomLog /var/log/apache2/access.support.https.log combined
</VirtualHost>
<VirtualHost *:80>
<IfModule headers_module>
Header always set Access-Control-Allow-Origin "*"
Header always set Cache-Control "max-age=86400;"
</IfModule>
DocumentRoot "/srv/www/adelie/support"
ServerName help.adelielinux.org
ServerAlias support.adelielinux.org
CustomLog /var/log/apache2/access.support.http.log combined
</VirtualHost>
<VirtualHost *:443>
SSLProxyEngine On
ProxyPreserveHost On
ProxyPass "/" "https://[2602:fe3d:0801::0005:0003]/"
ProxyPassReverse "/" "https://[2602:fe3d:0801::0005:0003]/"
ServerName wiki.adelielinux.org
</VirtualHost>
<VirtualHost *:80>
RewriteEngine On
RewriteRule (.*) https://wiki.adelielinux.org/$1 [R,L]
ServerName wiki.adelielinux.org
</VirtualHost>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment