From bfb306c6b8c5bb198a30635e6e26b3083bac7733 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sat, 4 Aug 2018 14:56:46 +0100 Subject: [PATCH] Teach cgiirc about site aliases --- cookbooks/cgiirc/recipes/default.rb | 3 ++- cookbooks/cgiirc/templates/default/apache.erb | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/cookbooks/cgiirc/recipes/default.rb b/cookbooks/cgiirc/recipes/default.rb index 764a6255c..7f6cd3557 100644 --- a/cookbooks/cgiirc/recipes/default.rb +++ b/cookbooks/cgiirc/recipes/default.rb @@ -39,10 +39,11 @@ template "/etc/cgiirc/ipaccess" do end ssl_certificate "irc.openstreetmap.org" do - domains "irc.openstreetmap.org" + domains ["irc.openstreetmap.org", "irc.osm.org"] notifies :reload, "service[apache2]" end apache_site "irc.openstreetmap.org" do template "apache.erb" + variables :aliases => ["irc.osm.org"] end diff --git a/cookbooks/cgiirc/templates/default/apache.erb b/cookbooks/cgiirc/templates/default/apache.erb index 780e54784..21e673308 100644 --- a/cookbooks/cgiirc/templates/default/apache.erb +++ b/cookbooks/cgiirc/templates/default/apache.erb @@ -29,9 +29,31 @@ SetEnv no-gzip +<% unless @aliases.empty? -%> + + + ServerName <%= @aliases.first %> +<% @aliases.drop(1).each do |alias_name| -%> + ServerAlias <%= alias_name %> +<% end -%> + ServerAdmin webmaster@openstreetmap.org + + SSLEngine on + SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem + SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key + + CustomLog /var/log/apache2/<%= @name %>-access.log combined + ErrorLog /var/log/apache2/<%= @name %>-error.log + + RedirectPermanent / https://<%= @name %>/ + +<% end -%> ServerName <%= @name %> +<% @aliases.each do |alias_name| -%> + ServerAlias <%= alias_name %> +<% end -%> ServerAdmin webmaster@openstreetmap.org CustomLog /var/log/apache2/<%= @name %>-access.log combined -- 2.43.2