Merge ~andreserl/maas:lp1749281_squid_renable into maas:master

Proposed by Andres Rodriguez on 2018-02-14
Status: Merged
Approved by: Andres Rodriguez on 2018-02-15
Approved revision: ba45bde2194ac331c2547b0618fa05b0efa03274
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~andreserl/maas:lp1749281_squid_renable
Merge into: maas:master
Diff against target: 15 lines (+6/-0)
1 file modified
debian/maas-proxy.postrm (+6/-0)
Reviewer Review Type Date Requested Status
Alberto Donato 2018-02-14 Approve on 2018-02-15
MAAS Lander Approve on 2018-02-14
Review via email: mp+337735@code.launchpad.net

Commit message

LP: #1749281 - When removing MAAS revert system proxy back to original state

To post a comment you must log in.
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b lp1749281_squid_renable lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: ba45bde2194ac331c2547b0618fa05b0efa03274

review: Approve
Alberto Donato (ack) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/maas-proxy.postrm b/debian/maas-proxy.postrm
2index 14cab88..9f5c346 100644
3--- a/debian/maas-proxy.postrm
4+++ b/debian/maas-proxy.postrm
5@@ -9,4 +9,10 @@ if [ "$1" = "purge" ]; then
6 rm -rf /var/lib/maas/maas-proxy.conf
7 fi
8
9+# MAAS installation disables system squid so it doesn't
10+# prevent MAAS from running our own squid daemon. As such,
11+# on removal, reenable squid.
12+systemctl enable squid >/dev/null 2>&1 || true
13+systemctl start squid >/dev/null 2>&1 || true
14+
15 #DEBHELPER#

Subscribers

People subscribed via source and target branches