Merge ~kumy/libravatar:bug-1781164 into ~libravatar/libravatar:master

[Mathieu Alorent]

b28dd61... by Mathieu Alorent <email address hidden> on 2018-07-11

LP: #1781164 Replace virtualhost placeholder

[François Marier (fmarier)]

Looking at the config as installed on the production server, I see:

  $ head /etc/apache2/sites-available/libravatar-seccdn.conf
  # -*-mode: apache;-*-
  <VirtualHost *:443>

So this seems to be working fine. Note that the debconf question which replaces the placeholder is set to priority "medium", so you might need to "dpkg-reconfigure -pmedium libravatar-seccdn" to see that question.

Moreover, the default is "*:443":

  Template: libravatar-seccdn/vhostaddress
  Type: string
  Default: *:443
  Description: Apache vhost address for the secure CDN:

So I'm not sure why it's not working for you.

Unmerged commits

b28dd61... by Mathieu Alorent <email address hidden> on 2018-07-11

LP: #1781164 Replace virtualhost placeholder

diff --git a/config/cdn.apache2.conf b/config/cdn.apache2.conf
index d66ee64..3c9f643 100644
--- a/config/cdn.apache2.conf
+++ b/config/cdn.apache2.conf
@@ -1,5 +1,5 @@
 # -*-mode: apache;-*-
-<VirtualHost __VHOSTADDRESS__>
+<VirtualHost *:80>
     ServerName __CDNSERVERNAME__
     __CDNSERVERALIAS__
     ServerAdmin __WEBMASTEREMAIL__
diff --git a/config/seccdn.apache2.conf b/config/seccdn.apache2.conf
index 25c04e8..bf54b73 100644
--- a/config/seccdn.apache2.conf
+++ b/config/seccdn.apache2.conf
@@ -1,5 +1,5 @@
 # -*-mode: apache;-*-
-<VirtualHost __VHOSTADDRESS__>
+<VirtualHost *:443>
     ServerName __SECCDNSERVERNAME__
     __SECCDNSERVERALIAS__
     ServerAdmin __WEBMASTEREMAIL__