launchpad-reviewers team mailing list archive

[Tom Wardill <tom.wardill@xxxxxxxxxxxxx>]

Tom Wardill has proposed merging ~twom/launchpad:apache-config-from-lpconfig into launchpad:master.

Commit message:
Copy apache config from LPCONFIG in Makefile

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~twom/launchpad/+git/launchpad/+merge/379644

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.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~twom/launchpad:apache-config-from-lpconfig into launchpad:master.

diff --git a/Makefile b/Makefile
index 9fc3323..619544e 100644
--- a/Makefile
+++ b/Makefile
@@ -449,7 +449,7 @@ copy-apache-config: codehosting-dir
 	fi; \
 	sed -e 's,%BRANCH_REWRITE%,$(shell pwd)/scripts/branch-rewrite.py,' \
 		-e 's,%LISTEN_ADDRESS%,$(LISTEN_ADDRESS),' \
-		configs/development/local-launchpad-apache > \
+		configs/$(LPCONFIG)/local-launchpad-apache > \
 		/etc/apache2/sites-available/$$base
 	if [ ! -d /srv/launchpad.test ]; then \
 		mkdir /srv/launchpad.test; \