Merge ~ines-almeida/launchpad:update-ppa-charms-configuration into launchpad:master

[Ines Almeida]

Update the PPA publisher apache configuration to use port 80 instead of 8080

This highly simplifies the setup needed for the load balancer (HAProxy) without making much of a difference otherwise.

[Colin Watson (cjwatson)]

review: Approve

diff --git a/charm/launchpad-ppa-publisher/reactive/launchpad-ppa-publisher.py b/charm/launchpad-ppa-publisher/reactive/launchpad-ppa-publisher.py
index da60fee..89a4445 100644
--- a/charm/launchpad-ppa-publisher/reactive/launchpad-ppa-publisher.py
+++ b/charm/launchpad-ppa-publisher/reactive/launchpad-ppa-publisher.py
@@ -161,7 +161,7 @@ def configure_apache_website():
     apache_website.set_remote(
         domain=domain,
         enabled="true",
-        ports="8080",
+        ports="80",
         site_config="\n".join(site_configs),
         site_modules="expires headers rewrite wsgi",
     )
diff --git a/charm/launchpad-ppa-publisher/templates/vhosts/ppa.conf.j2 b/charm/launchpad-ppa-publisher/templates/vhosts/ppa.conf.j2
index 4f91629..d6c8e42 100644
--- a/charm/launchpad-ppa-publisher/templates/vhosts/ppa.conf.j2
+++ b/charm/launchpad-ppa-publisher/templates/vhosts/ppa.conf.j2
@@ -1,4 +1,4 @@
-<VirtualHost *:8080>
+<VirtualHost *:80>
 	ServerName {{ domain_ppa }}
 {%- if domain_alternate %}
 	ServerAlias {{ domain_ppa_alternate }}
diff --git a/charm/launchpad-ppa-publisher/templates/vhosts/private-ppa.buildd.conf.j2 b/charm/launchpad-ppa-publisher/templates/vhosts/private-ppa.buildd.conf.j2
index 90df926..7c6518d 100644
--- a/charm/launchpad-ppa-publisher/templates/vhosts/private-ppa.buildd.conf.j2
+++ b/charm/launchpad-ppa-publisher/templates/vhosts/private-ppa.buildd.conf.j2
@@ -1,4 +1,4 @@
-<VirtualHost *:8080>
+<VirtualHost *:80>
 	#NOWEBSTATS
 	ServerName {{ domain_ppa_buildd }}
 	DocumentRoot	{{ ppa_archive_private_root }}
diff --git a/charm/launchpad-ppa-publisher/templates/vhosts/private-ppa.conf.j2 b/charm/launchpad-ppa-publisher/templates/vhosts/private-ppa.conf.j2
index a3f59f5..9009aed 100644
--- a/charm/launchpad-ppa-publisher/templates/vhosts/private-ppa.conf.j2
+++ b/charm/launchpad-ppa-publisher/templates/vhosts/private-ppa.conf.j2
@@ -1,4 +1,4 @@
-<VirtualHost *:8080>
+<VirtualHost *:80>
 	ServerName {{ domain_ppa_private }}
 {%- if domain_alternate %}
 	ServerAlias {{ domain_ppa_private_alternate }}