Launchpad itself

Merge ~twom/launchpad:apache-config-from-lpconfig into launchpad:master

  1. Git
  2. lp:~twom/launchpad
  3. apache-config-from-lpconfig
  4. Merge into master
Proposed by Tom Wardill
Status: Merged
Approved by: Tom Wardill
Approved revision: e02c3d2aac3ea228b2887026e010869e17488c68
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~twom/launchpad:apache-config-from-lpconfig
Merge into: launchpad:master
Diff against target: 24 lines (+3/-3)
1 file modified
Makefile (+3/-3)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+379644@code.launchpad.net

Commit message

Copy apache config from LPCONFIG in Makefile

Description of the change

The Makefile is hardcoded to copy the apache config file from the configs/development directory.
LPCONFIG defaults to this value, so the make rule to use LPCONFIG so it can be overriden.

Useful for installing apache configs from a different config source.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve
~twom/launchpad:apache-config-from-lpconfig updated
e02c3d2... by Tom Wardill

Also use LPCONFIG in copy-certificates rule

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 9fc3323..b416d3d 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -434,8 +434,8 @@ install: reload-apache
6
7 copy-certificates:
8 mkdir -p /etc/apache2/ssl
9- cp configs/development/launchpad.crt /etc/apache2/ssl/
10- cp configs/development/launchpad.key /etc/apache2/ssl/
11+ cp configs/$(LPCONFIG)/launchpad.crt /etc/apache2/ssl/
12+ cp configs/$(LPCONFIG)/launchpad.key /etc/apache2/ssl/
13
14 copy-apache-config: codehosting-dir
15 # We insert the absolute path to the branch-rewrite script
16@@ -449,7 +449,7 @@ copy-apache-config: codehosting-dir
17 fi; \
18 sed -e 's,%BRANCH_REWRITE%,$(shell pwd)/scripts/branch-rewrite.py,' \
19 -e 's,%LISTEN_ADDRESS%,$(LISTEN_ADDRESS),' \
20- configs/development/local-launchpad-apache > \
21+ configs/$(LPCONFIG)/local-launchpad-apache > \
22 /etc/apache2/sites-available/$$base
23 if [ ! -d /srv/launchpad.test ]; then \
24 mkdir /srv/launchpad.test; \

Subscribers

People subscribed via source and target branches

to status/vote changes: