Merge ~cjwatson/launchpad:charm-cron-control-redirects into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: f44e64c3c698b7bc4eaa374c2d6b3a72b7cbf5bc
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:charm-cron-control-redirects
Merge into: launchpad:master
Diff against target: 15 lines (+6/-0)
1 file modified
charm/launchpad-cron-control/templates/vhosts/cron-http.conf.j2 (+6/-0)
Reviewer Review Type Date Requested Status
Simone Pelosi Approve
Review via email: mp+453164@code.launchpad.net

Commit message

charm: Redirect old cron-control URLs

Description of the change

The current URLs used for cron-control on production, qastaging, and staging are "http://cron-control.lp.internal/production.ini", "http://cron-control.qastaging.lp.internal/qastaging.ini", and "http://cron-control.staging.lp.internal/staging.ini" respectively. The `launchpad-cron-control` charm just exposes `/cron.ini`, which is simpler.

However, to migrate to this, we're going to need to change DNS for `cron-control.lp.internal` etc., and it's going to be awkward to coordinate that change with also changing all the URLs to `/cron.ini`. Redirecting the old URLs for a transitional period will simplify this.

To post a comment you must log in.
Revision history for this message
Simone Pelosi (pelpsi) wrote :

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/launchpad-cron-control/templates/vhosts/cron-http.conf.j2 b/charm/launchpad-cron-control/templates/vhosts/cron-http.conf.j2
2index 1525ef2..a1e94e5 100644
3--- a/charm/launchpad-cron-control/templates/vhosts/cron-http.conf.j2
4+++ b/charm/launchpad-cron-control/templates/vhosts/cron-http.conf.j2
5@@ -9,5 +9,11 @@
6 <Directory "{{ www_dir }}/">
7 Require all granted
8 </Directory>
9+
10+ # XXX cjwatson 2023-10-09: Temporarily redirect old URLs until we've
11+ # finished migration.
12+ Redirect /production.ini /cron.ini
13+ Redirect /qastaging.ini /cron.ini
14+ Redirect /staging.ini /cron.ini
15 </VirtualHost>
16

Subscribers

People subscribed via source and target branches

to status/vote changes: