dev: fix apis.dev.osm.org alias typo

[chef.git] / cookbooks / dev / templates / default / apache.phppgadmin.erb

diff --git a/cookbooks/dev/templates/default/apache.phppgadmin.erb b/cookbooks/dev/templates/default/apache.phppgadmin.erb
index fba25578118e04fdb318f9d23370bcc13f8b40dd..67c37df16420bcea4c2cb794943d818ccb9a6585 100644 (file)
--- a/cookbooks/dev/templates/default/apache.phppgadmin.erb
+++ b/cookbooks/dev/templates/default/apache.phppgadmin.erb
@@ -2,13 +2,15 @@
 
 <VirtualHost *:443>
        ServerName phppgadmin.dev.openstreetmap.org
 
 <VirtualHost *:443>
        ServerName phppgadmin.dev.openstreetmap.org

+       ServerAlias phppgadmin.dev.osm.org
+

        ServerAdmin webmaster@openstreetmap.org
 
        SSLEngine on
        SSLCertificateFile /etc/ssl/certs/phppgadmin.dev.openstreetmap.org.pem
        SSLCertificateKeyFile /etc/ssl/private/phppgadmin.dev.openstreetmap.org.key
 
        ServerAdmin webmaster@openstreetmap.org
 
        SSLEngine on
        SSLCertificateFile /etc/ssl/certs/phppgadmin.dev.openstreetmap.org.pem
        SSLCertificateKeyFile /etc/ssl/private/phppgadmin.dev.openstreetmap.org.key
 

-       CustomLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-error.log
 
        DocumentRoot /usr/share/phppgadmin
        ErrorLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-error.log
 
        DocumentRoot /usr/share/phppgadmin


@@ -23,9 +25,11 @@
 
 <VirtualHost *:80>
        ServerName phppgadmin.dev.openstreetmap.org
 
 <VirtualHost *:80>
        ServerName phppgadmin.dev.openstreetmap.org

+       ServerAlias phppgadmin.dev.osm.org
+

        ServerAdmin webmaster@openstreetmap.org
 
        ServerAdmin webmaster@openstreetmap.org
 

-       CustomLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-error.log
 
        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
        ErrorLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-error.log
 
        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/