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

Proposed by Colin Watson on 2019-05-29
Status: Merged
Approved by: Colin Watson on 2019-05-29
Approved revision: eb66f7f50bda0ab63ec24c4950884498f571c4d0
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/turnip:launchpad-test-domain
Merge into: turnip:master
Diff against target: 94 lines (+18/-18)
4 files modified
charm/Makefile (+8/-8)
charm/turnip-pack-frontend-http/config.yaml (+3/-3)
charm/turnip-pack-frontend-ssh/config.yaml (+1/-1)
config.yaml (+6/-6)
Reviewer Review Type Date Requested Status
Adam Collard (community) 2019-05-29 Approve on 2019-05-29
Review via email: mp+368024@code.launchpad.net

Commit message

Handle renaming of launchpad.dev to launchpad.test

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

To post a comment you must log in.
Adam Collard (adam-collard) wrote :

All the sed's!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/Makefile b/charm/Makefile
2index 3080fbd..2b01ef9 100644
3--- a/charm/Makefile
4+++ b/charm/Makefile
5@@ -61,19 +61,19 @@ clean-%:
6 @echo "Cleaning $*..."
7 @rm -rf dist/.built-$* dist/builds/$* $(PUBLISHDIR)/$*
8
9-tmp/git.launchpad.dev.crt: | $(TMPDIR)
10- openssl req -new -nodes -keyout tmp/git.launchpad.dev.key \
11- -out tmp/git.launchpad.dev.csr -subj '/CN=git.launchpad.dev'
12- openssl x509 -req -days 365 -in tmp/git.launchpad.dev.csr \
13- -signkey tmp/git.launchpad.dev.key -out $@
14+tmp/git.launchpad.test.crt: | $(TMPDIR)
15+ openssl req -new -nodes -keyout tmp/git.launchpad.test.key \
16+ -out tmp/git.launchpad.test.csr -subj '/CN=git.launchpad.test'
17+ openssl x509 -req -days 365 -in tmp/git.launchpad.test.csr \
18+ -signkey tmp/git.launchpad.test.key -out $@
19
20 tmp/ssh-host-key: | $(TMPDIR)
21 ssh-keygen -t rsa -b 2048 -f $@ -N ''
22
23-bundle.yaml: bundle.yaml.in tmp/git.launchpad.dev.crt tmp/ssh-host-key
24+bundle.yaml: bundle.yaml.in tmp/git.launchpad.test.crt tmp/ssh-host-key
25 sed -e 's/%BUILD_LABEL%/$(BUILD_LABEL)/g' \
26- -e "s/%SSL_KEY%/$$(base64 -w 0 <tmp/git.launchpad.dev.key)/g" \
27- -e "s/%SSL_CERT%/$$(base64 -w 0 <tmp/git.launchpad.dev.crt)/g" \
28+ -e "s/%SSL_KEY%/$$(base64 -w 0 <tmp/git.launchpad.test.key)/g" \
29+ -e "s/%SSL_CERT%/$$(base64 -w 0 <tmp/git.launchpad.test.crt)/g" \
30 -e "s/%PRIVATE_SSH_KEY%/$$(base64 -w 0 <tmp/ssh-host-key)/g" \
31 -e "s/%PUBLIC_SSH_KEY%/$$(base64 -w 0 <tmp/ssh-host-key.pub)/g" \
32 bundle.yaml.in >bundle.yaml
33diff --git a/charm/turnip-pack-frontend-http/config.yaml b/charm/turnip-pack-frontend-http/config.yaml
34index c40fe31..31f0476 100644
35--- a/charm/turnip-pack-frontend-http/config.yaml
36+++ b/charm/turnip-pack-frontend-http/config.yaml
37@@ -5,15 +5,15 @@ options:
38 description: Smart HTTP service port.
39 openid_provider_root:
40 type: string
41- default: https://testopenid.dev/
42+ default: https://testopenid.test/
43 description: URL to the OpenID provider to authenticate against.
44 site_name:
45 type: string
46- default: git.launchpad.dev
47+ default: git.launchpad.test
48 description: Public host name used for clone URLs in cgit.
49 main_site_root:
50 type: string
51- default: https://launchpad.dev/
52+ default: https://launchpad.test/
53 description: Root URL to the associated main Launchpad instance.
54 cgit_user:
55 type: string
56diff --git a/charm/turnip-pack-frontend-ssh/config.yaml b/charm/turnip-pack-frontend-ssh/config.yaml
57index 56f96dc..1547271 100644
58--- a/charm/turnip-pack-frontend-ssh/config.yaml
59+++ b/charm/turnip-pack-frontend-ssh/config.yaml
60@@ -13,5 +13,5 @@ options:
61 description: Base64 encoded public host ssh key.
62 authentication_endpoint:
63 type: string
64- default: http://xmlrpc-private.launchpad.dev:8087/authserver
65+ default: http://xmlrpc-private.launchpad.test:8087/authserver
66 description: XMLRPC auth
67diff --git a/config.yaml b/config.yaml
68index 0f9de44..db941a8 100644
69--- a/config.yaml
70+++ b/config.yaml
71@@ -1,4 +1,4 @@
72-authentication_endpoint: http://xmlrpc-private.launchpad.dev:8087/authserver
73+authentication_endpoint: http://xmlrpc-private.launchpad.test:8087/authserver
74 pack_backend_host: localhost
75 pack_backend_port: 19418
76 pack_frontend_port: 9418
77@@ -10,12 +10,12 @@ repo_api_port: 19417
78 smart_http_port: 9419
79 smart_ssh_port: 9422
80 moduli_path: /etc/ssh/moduli
81-repo_store: /var/tmp/git.launchpad.dev
82+repo_store: /var/tmp/git.launchpad.test
83 turnip_log_dir: ./
84-virtinfo_endpoint: http://xmlrpc-private.launchpad.dev:8087/git
85+virtinfo_endpoint: http://xmlrpc-private.launchpad.test:8087/git
86 cgit_exec_path: /usr/lib/cgit/cgit.cgi
87 cgit_data_path: /usr/share/cgit
88 cgit_secret_path: null
89-openid_provider_root: https://testopenid.dev/
90-site_name: git.launchpad.dev
91-main_site_root: https://launchpad.dev/
92+openid_provider_root: https://testopenid.test/
93+site_name: git.launchpad.test
94+main_site_root: https://launchpad.test/

Subscribers

People subscribed via source and target branches