Merge ~andreserl/maas:lp1749281_squid_renable into maas:master

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
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 (community) Approve
MAAS Lander Approve
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.
Revision history for this message
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
Revision history for this message
Alberto Donato (ack) wrote :

LGTM

review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches