]> git.openstreetmap.org Git - chef.git/blobdiff - cookbooks/chef/templates/default/apache.erb
Update taginfo package list for Ubuntu 18.04 compatibility
[chef.git] / cookbooks / chef / templates / default / apache.erb
index f6c1806b1f704031ffe72065f9cff6df75137f1e..706ab5eadc9f9d754d2df3f9619cc094f071b728 100644 (file)
@@ -8,6 +8,7 @@
        CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined
        ErrorLog /var/log/apache2/chef.openstreetmap.org-error.log
 
+       RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
        Redirect permanent / https://chef.openstreetmap.org/
 </VirtualHost>
 
 
        SSLEngine on
        SSLProxyEngine on
+       SSLCertificateFile /etc/ssl/certs/chef.openstreetmap.org.pem
+       SSLCertificateKeyFile /etc/ssl/private/chef.openstreetmap.org.key
 
+       ProxyPassMatch ^/.*\.git/ !
        ProxyPass / https://<%= node[:fqdn] %>:4443/
+       ProxyPreserveHost on
+
+       SetEnv GIT_PROJECT_ROOT /var/lib/git
+       SetEnv GIT_HTTP_EXPORT_ALL
+       ScriptAlias / /usr/lib/git-core/git-http-backend/
 </VirtualHost>
+
+<Directory /usr/lib/git-core>
+       Options ExecCGI
+       Require ip <%= @git_allowed.sort.join(" ") %>
+</Directory>