~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:restart-apache-for-mpm

Branch merges

Propose for merging

Merged into ubuntu-mirror-charm:master at revision f12d582a5e9a2af01af387297e1758c235aaf95f

Haw Loeung: Approve (+1) on 2020-03-22

Paul Collins: Approve (self) on 2020-03-22

Canonical IS Reviewers: Pending requested 2020-03-22

Diff: 34 lines (+3/-1)

1 file modified

hooks/hooks.py (+3/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

cbe605c... by Paul Collins on 2020-03-22

configure_apache_mpm: return True when changing MPM so that Apache is restarted

9ee3925... by Paul Collins on 2020-03-20

start rsync after we enable it. get rid of the pointless start and stop hooks

Reviewed-on: https://code.launchpad.net/~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm/+merge/380935
Reviewed-by: Barry Price <email address hidden>

ef3a1fc... by Paul Collins on 2020-03-20

start rsync after we enable it. get rid of the pointless start and stop hooks

a9ba650... by Paul Collins on 2020-03-20

check-mirror.sh: use the system keyring, which we can rely on existing

Reviewed-on: https://code.launchpad.net/~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm/+merge/380932
Reviewed-by: Thomas Cuthbert <email address hidden>

ab273f6... by Paul Collins <paul@agnew> on 2020-03-20

check-mirror.sh: use the system keyring, which we can rely on existing

It includes the following:

pub rsa4096 2012-05-11 [SC]
      790BC7277767219C42C86F933B4FE6ACC0B21F32
uid [ unknown] Ubuntu Archive Automatic Signing Key (2012) <email address hidden>

pub rsa4096 2012-05-11 [SC]
      843938DF228D22F7B3742BC0D94AA3F0EFE21092
uid [ unknown] Ubuntu CD Image Automatic Signing Key (2012) <email address hidden>

pub rsa4096 2018-09-17 [SC]
      F6ECB3762474EDA9D21B7022871920D1991BC93C
uid [ unknown] Ubuntu Archive Automatic Signing Key (2018) <email address hidden>

2e6f364... by Paul Collins on 2020-03-19

support TLS and listening on specific addresses

This is so that we can avoid opening port 443 on archive.ubuntu.com.

Reviewed-on: https://code.launchpad.net/~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm/+merge/380758
Reviewed-by: Joel Sing <email address hidden>

64c5add... by Paul Collins on 2020-03-18

address some review comments

61a5340... by Paul Collins on 2020-03-18

enable ssl and restart, if necessary

a6897c7... by Paul Collins on 2020-03-18

all_addresses.discard to get rid of an address!

convert ports to int to fix ordering, and rewrite template to emit the comment block only once

1e2898b... by Paul Collins on 2020-03-17

ensure we only listen on specific IPs for non-port-80

Also, generate a cleaner result when addresses is empty.