From: Tom Hughes Date: Thu, 4 Jan 2018 18:31:52 +0000 (+0000) Subject: Bring dev.osm.org under chef control and SSL enable it X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/a9f433816cbd0c2824f52d2a63552e0905d64c9d Bring dev.osm.org under chef control and SSL enable it --- diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index bdcec265a..4ac58484b 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -98,6 +98,28 @@ file "/etc/php/7.0/fpm/pool.d/www.conf" do notifies :reload, "service[php7.0-fpm]" end +directory "/srv/dev.openstreetmap.org" do + owner "root" + group "root" + mode 0o755 +end + +template "/srv/dev.openstreetmap.org/index.html" do + source "dev.html.erb" + owner "root" + group "root" + mode 0o644 +end + +ssl_certificate "dev.openstreetmap.org" do + domains "dev.openstreetmap.org" + notifies :reload, "service[apache2]" +end + +apache_site "dev.openstreetmap.org" do + template "apache.dev.erb" +end + package "phppgadmin" template "/etc/phppgadmin/config.inc.php" do diff --git a/cookbooks/dev/templates/default/apache.dev.erb b/cookbooks/dev/templates/default/apache.dev.erb new file mode 100644 index 000000000..71b73b976 --- /dev/null +++ b/cookbooks/dev/templates/default/apache.dev.erb @@ -0,0 +1,35 @@ +# DO NOT EDIT - This file is being maintained by Chef + + + ServerName dev.openstreetmap.org + ServerAdmin webmaster@openstreetmap.org + + SSLEngine on + SSLCertificateFile /etc/ssl/certs/dev.openstreetmap.org.pem + SSLCertificateKeyFile /etc/ssl/private/dev.openstreetmap.org.key + + CustomLog /var/log/apache2/dev.openstreetmap.org-access.log combined + ErrorLog /var/log/apache2/dev.openstreetmap.org-error.log + + DocumentRoot /srv/dev.openstreetmap.org + + RewriteEngine on + RewriteCond %{REQUEST_URI} ^/~([^/]*)(/.*)?$ + RewriteCond /home/%1/public_html -d + RewriteRule ^/~([^/]*)(/.*)?$ https://$1.dev.openstreetmap.org$2 [NS,R=307] + + + + ServerName dev.openstreetmap.org + ServerAdmin webmaster@openstreetmap.org + + CustomLog /var/log/apache2/dev.openstreetmap.org-access.log combined + ErrorLog /var/log/apache2/dev.openstreetmap.org-error.log + + RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ + RedirectPermanent / https://dev.openstreetmap.org/ + + + + Require all granted + diff --git a/cookbooks/dev/templates/default/dev.html.erb b/cookbooks/dev/templates/default/dev.html.erb new file mode 100644 index 000000000..3b4ab2fba --- /dev/null +++ b/cookbooks/dev/templates/default/dev.html.erb @@ -0,0 +1,10 @@ + + +You've reached errol, the OpenStreetMap dev server.
+

If you are a user...: You probably want OpenStreetMap itself.
If you are a developer...: You might be interested in live instances of various Rails Port code branches in SVN for testing clients against.