Launchpad itself

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

  1. Git
  2. lp:~ines-almeida/launchpad
  3. update-ppa-charms-configuration
  4. Merge into master
Proposed by Ines Almeida
Status: Merged
Approved by: Ines Almeida
Approved revision: 41a749bcd8042cf4b37bd63916d949e7cb29d348
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~ines-almeida/launchpad:update-ppa-charms-configuration
Merge into: launchpad:master
Diff against target: 43 lines (+4/-4)
4 files modified
charm/launchpad-ppa-publisher/reactive/launchpad-ppa-publisher.py (+1/-1)
charm/launchpad-ppa-publisher/templates/vhosts/ppa.conf.j2 (+1/-1)
charm/launchpad-ppa-publisher/templates/vhosts/private-ppa.buildd.conf.j2 (+1/-1)
charm/launchpad-ppa-publisher/templates/vhosts/private-ppa.conf.j2 (+1/-1)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+450146@code.launchpad.net

Commit message

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.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/launchpad-ppa-publisher/reactive/launchpad-ppa-publisher.py b/charm/launchpad-ppa-publisher/reactive/launchpad-ppa-publisher.py
2index da60fee..89a4445 100644
3--- a/charm/launchpad-ppa-publisher/reactive/launchpad-ppa-publisher.py
4+++ b/charm/launchpad-ppa-publisher/reactive/launchpad-ppa-publisher.py
5@@ -161,7 +161,7 @@ def configure_apache_website():
6 apache_website.set_remote(
7 domain=domain,
8 enabled="true",
9- ports="8080",
10+ ports="80",
11 site_config="\n".join(site_configs),
12 site_modules="expires headers rewrite wsgi",
13 )
14diff --git a/charm/launchpad-ppa-publisher/templates/vhosts/ppa.conf.j2 b/charm/launchpad-ppa-publisher/templates/vhosts/ppa.conf.j2
15index 4f91629..d6c8e42 100644
16--- a/charm/launchpad-ppa-publisher/templates/vhosts/ppa.conf.j2
17+++ b/charm/launchpad-ppa-publisher/templates/vhosts/ppa.conf.j2
18@@ -1,4 +1,4 @@
19-<VirtualHost *:8080>
20+<VirtualHost *:80>
21 ServerName {{ domain_ppa }}
22 {%- if domain_alternate %}
23 ServerAlias {{ domain_ppa_alternate }}
24diff --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
25index 90df926..7c6518d 100644
26--- a/charm/launchpad-ppa-publisher/templates/vhosts/private-ppa.buildd.conf.j2
27+++ b/charm/launchpad-ppa-publisher/templates/vhosts/private-ppa.buildd.conf.j2
28@@ -1,4 +1,4 @@
29-<VirtualHost *:8080>
30+<VirtualHost *:80>
31 #NOWEBSTATS
32 ServerName {{ domain_ppa_buildd }}
33 DocumentRoot {{ ppa_archive_private_root }}
34diff --git a/charm/launchpad-ppa-publisher/templates/vhosts/private-ppa.conf.j2 b/charm/launchpad-ppa-publisher/templates/vhosts/private-ppa.conf.j2
35index a3f59f5..9009aed 100644
36--- a/charm/launchpad-ppa-publisher/templates/vhosts/private-ppa.conf.j2
37+++ b/charm/launchpad-ppa-publisher/templates/vhosts/private-ppa.conf.j2
38@@ -1,4 +1,4 @@
39-<VirtualHost *:8080>
40+<VirtualHost *:80>
41 ServerName {{ domain_ppa_private }}
42 {%- if domain_alternate %}
43 ServerAlias {{ domain_ppa_private_alternate }}

Subscribers

People subscribed via source and target branches

to status/vote changes: