Merge ~cjwatson/turnip:launchpad-test-domain into turnip:master

[Colin Watson]

Handle renaming of launchpad.dev to launchpad.test

Launchpad's local deployments now use launchpad.test, so we should
follow suit.

[Adam Collard (adam-collard)]

All the sed's!

review: Approve

diff --git a/charm/Makefile b/charm/Makefile
index 3080fbd..2b01ef9 100644
--- a/charm/Makefile
+++ b/charm/Makefile
@@ -61,19 +61,19 @@ clean-%:
 	@echo "Cleaning $*..."
 	@rm -rf dist/.built-$* dist/builds/$* $(PUBLISHDIR)/$*
 
-tmp/git.launchpad.dev.crt: | $(TMPDIR)
-	openssl req -new -nodes -keyout tmp/git.launchpad.dev.key \
-		-out tmp/git.launchpad.dev.csr -subj '/CN=git.launchpad.dev'
-	openssl x509 -req -days 365 -in tmp/git.launchpad.dev.csr \
-		-signkey tmp/git.launchpad.dev.key -out $@
+tmp/git.launchpad.test.crt: | $(TMPDIR)
+	openssl req -new -nodes -keyout tmp/git.launchpad.test.key \
+		-out tmp/git.launchpad.test.csr -subj '/CN=git.launchpad.test'
+	openssl x509 -req -days 365 -in tmp/git.launchpad.test.csr \
+		-signkey tmp/git.launchpad.test.key -out $@
 
 tmp/ssh-host-key: | $(TMPDIR)
 	ssh-keygen -t rsa -b 2048 -f $@ -N ''
 
-bundle.yaml: bundle.yaml.in tmp/git.launchpad.dev.crt tmp/ssh-host-key
+bundle.yaml: bundle.yaml.in tmp/git.launchpad.test.crt tmp/ssh-host-key
 	sed -e 's/%BUILD_LABEL%/$(BUILD_LABEL)/g' \
-	     -e "s/%SSL_KEY%/$$(base64 -w 0 <tmp/git.launchpad.dev.key)/g" \
-	     -e "s/%SSL_CERT%/$$(base64 -w 0 <tmp/git.launchpad.dev.crt)/g" \
+	     -e "s/%SSL_KEY%/$$(base64 -w 0 <tmp/git.launchpad.test.key)/g" \
+	     -e "s/%SSL_CERT%/$$(base64 -w 0 <tmp/git.launchpad.test.crt)/g" \
 	     -e "s/%PRIVATE_SSH_KEY%/$$(base64 -w 0 <tmp/ssh-host-key)/g" \
 	     -e "s/%PUBLIC_SSH_KEY%/$$(base64 -w 0 <tmp/ssh-host-key.pub)/g" \
 	     bundle.yaml.in >bundle.yaml
diff --git a/charm/turnip-pack-frontend-http/config.yaml b/charm/turnip-pack-frontend-http/config.yaml
index c40fe31..31f0476 100644
--- a/charm/turnip-pack-frontend-http/config.yaml
+++ b/charm/turnip-pack-frontend-http/config.yaml
@@ -5,15 +5,15 @@ options:
     description: Smart HTTP service port.
   openid_provider_root:
     type: string
-    default: https://testopenid.dev/
+    default: https://testopenid.test/
     description: URL to the OpenID provider to authenticate against.
   site_name:
     type: string
-    default: git.launchpad.dev
+    default: git.launchpad.test
     description: Public host name used for clone URLs in cgit.
   main_site_root:
     type: string
-    default: https://launchpad.dev/
+    default: https://launchpad.test/
     description: Root URL to the associated main Launchpad instance.
   cgit_user:
     type: string
diff --git a/charm/turnip-pack-frontend-ssh/config.yaml b/charm/turnip-pack-frontend-ssh/config.yaml
index 56f96dc..1547271 100644
--- a/charm/turnip-pack-frontend-ssh/config.yaml
+++ b/charm/turnip-pack-frontend-ssh/config.yaml
@@ -13,5 +13,5 @@ options:
     description: Base64 encoded public host ssh key.
   authentication_endpoint:
     type: string
-    default: http://xmlrpc-private.launchpad.dev:8087/authserver
+    default: http://xmlrpc-private.launchpad.test:8087/authserver
     description: XMLRPC auth
diff --git a/config.yaml b/config.yaml
index 0f9de44..db941a8 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,4 +1,4 @@
-authentication_endpoint: http://xmlrpc-private.launchpad.dev:8087/authserver
+authentication_endpoint: http://xmlrpc-private.launchpad.test:8087/authserver
 pack_backend_host: localhost
 pack_backend_port: 19418
 pack_frontend_port: 9418
@@ -10,12 +10,12 @@ repo_api_port: 19417
 smart_http_port: 9419
 smart_ssh_port: 9422
 moduli_path: /etc/ssh/moduli
-repo_store: /var/tmp/git.launchpad.dev
+repo_store: /var/tmp/git.launchpad.test
 turnip_log_dir: ./
-virtinfo_endpoint: http://xmlrpc-private.launchpad.dev:8087/git
+virtinfo_endpoint: http://xmlrpc-private.launchpad.test:8087/git
 cgit_exec_path: /usr/lib/cgit/cgit.cgi
 cgit_data_path: /usr/share/cgit
 cgit_secret_path: null
-openid_provider_root: https://testopenid.dev/
-site_name: git.launchpad.dev
-main_site_root: https://launchpad.dev/
+openid_provider_root: https://testopenid.test/
+site_name: git.launchpad.test
+main_site_root: https://launchpad.test/