MAAS

Merge lp:~andreserl/maas/lp1482859 into lp:~maas-maintainers/maas/packaging

  1. lp1482859
  2. Merge into packaging
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 421
Merged at revision: 420
Proposed branch: lp:~andreserl/maas/lp1482859
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 113 lines (+16/-8)
8 files modified
debian/changelog (+3/-1)
debian/extras/maas-proxy-common.sh (+1/-1)
debian/maas-proxy.install (+1/-1)
debian/maas-proxy.logrotate (+1/-1)
debian/maas-proxy.maas-proxy.service (+2/-2)
debian/maas-proxy.maas-proxy.upstart (+1/-1)
debian/maas-proxy.postinst (+6/-0)
debian/maas-proxy.postrm (+1/-1)
To merge this branch: bzr merge lp:~andreserl/maas/lp1482859
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+267919@code.launchpad.net

This proposal supersedes a proposal from 2015-08-13.

Commit message

Move /etc/maas/maas-proxy.conf to /usr/share/maas/maas-proxy.conf as
this is not a config we want users to modify. (LP: #1482859)

To post a comment you must log in.
lp:~andreserl/maas/lp1482859 updated
421. By Andres Rodriguez

Update postinst

Revision history for this message
Gavin Panella (allenap) wrote :

Looks good. One question.

review: Approve
Revision history for this message
Christian Reis (kiko) wrote :

Why did we choose /usr/share as opposed to /var/lib?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-08-11 10:57:05 +0000
3+++ debian/changelog 2015-08-13 09:54:25 +0000
4@@ -1,4 +1,4 @@
5-maas (1.9.0~alpha1+bzr4177-0ubuntu1) UNRELEASED; urgency=medium
6+maas (1.9.0~alpha1+bzr4185-0ubuntu1) UNRELEASED; urgency=medium
7
8 * UNRELEASED
9
10@@ -22,6 +22,8 @@
11 * debian/control: Make maas-dns a Dependy of maas-region-controller.
12 * Update the location of dhcpd.conf and dhcpd6.conf to be /var/lib/maas/
13 and handle upgrades. (LP: #1482857)
14+ * Move /etc/maas/maas-proxy.conf to /usr/share/maas/maas-proxy.conf as
15+ this is not a config we want users to modify. (LP: #1482859)
16
17 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 12 Jun 2015 14:16:47 -0400
18
19
20=== modified file 'debian/extras/maas-proxy-common.sh'
21--- debian/extras/maas-proxy-common.sh 2015-06-18 09:10:03 +0000
22+++ debian/extras/maas-proxy-common.sh 2015-08-13 09:54:25 +0000
23@@ -16,6 +16,6 @@
24 chown -R proxy:proxy /var/log/maas/proxy
25 fi
26 if [ ! -d /var/cache/maas-proxy/00 ]; then
27- $SQUID -z -N -f /etc/maas/maas-proxy.conf
28+ $SQUID -z -N -f /usr/share/maas/maas-proxy.conf
29 fi
30 }
31
32=== modified file 'debian/maas-proxy.install'
33--- debian/maas-proxy.install 2014-09-21 22:05:31 +0000
34+++ debian/maas-proxy.install 2015-08-13 09:54:25 +0000
35@@ -1,3 +1,3 @@
36-debian/extras/maas-proxy.conf etc/maas/
37+debian/extras/maas-proxy.conf usr/share/maas/
38 debian/extras/maas-proxy-common.sh usr/share/maas/
39 debian/extras/squid3.override etc/init/
40
41=== modified file 'debian/maas-proxy.logrotate'
42--- debian/maas-proxy.logrotate 2014-09-12 19:10:04 +0000
43+++ debian/maas-proxy.logrotate 2015-08-13 09:54:25 +0000
44@@ -19,6 +19,6 @@
45 exit 1
46 fi
47
48- test ! -e /var/run/maas-proxy.pid || $SQUID -f /etc/maas/maas-proxy.conf -k rotate
49+ test ! -e /var/run/maas-proxy.pid || $SQUID -f /usr/share/maas/maas-proxy.conf -k rotate
50 endscript
51 }
52
53=== modified file 'debian/maas-proxy.maas-proxy.service'
54--- debian/maas-proxy.maas-proxy.service 2015-04-24 18:05:29 +0000
55+++ debian/maas-proxy.maas-proxy.service 2015-08-13 09:54:25 +0000
56@@ -2,14 +2,14 @@
57 Description=MAAS Proxy
58 Requires=network-online.target
59 After=network-online.target
60-ConditionPathExists=/etc/maas/maas-proxy.conf
61+ConditionPathExists=/usr/share/maas/maas-proxy.conf
62
63 [Service]
64 ExecStartPre=/bin/mkdir -p /run/maas/proxy
65 ExecStartPre=/bin/sh -ec '\
66 . /usr/share/maas/maas-proxy-common.sh; \
67 pre_start'
68-ExecStart=/usr/sbin/squid3 -N -f /etc/maas/maas-proxy.conf
69+ExecStart=/usr/sbin/squid3 -N -f /usr/share/maas/maas-proxy.conf
70
71 [Install]
72 WantedBy=multi-user.target
73
74=== modified file 'debian/maas-proxy.maas-proxy.upstart'
75--- debian/maas-proxy.maas-proxy.upstart 2014-09-19 19:47:42 +0000
76+++ debian/maas-proxy.maas-proxy.upstart 2015-08-13 09:54:25 +0000
77@@ -20,5 +20,5 @@
78 echo "No squid binary found"
79 exit 1
80 fi
81- exec $SQUID -N -f /etc/maas/maas-proxy.conf
82+ exec $SQUID -N -f /usr/share/maas/maas-proxy.conf
83 end script
84
85=== modified file 'debian/maas-proxy.postinst'
86--- debian/maas-proxy.postinst 2015-04-01 12:41:52 +0000
87+++ debian/maas-proxy.postinst 2015-08-13 09:54:25 +0000
88@@ -17,6 +17,12 @@
89 mkdir -p /var/log/maas/proxy
90 chown -R proxy:proxy /var/log/maas/proxy
91
92+ # Move maas-proxy.conf if we are upgrading from an earlier
93+ # version that used to ship maas-proxy.conf in /etc/maas.
94+ if [ -f /etc/maas/maas-proxy.conf ]; then
95+ mv /etc/maas/maas-proxy.conf /usr/share/maas/
96+ fi
97+
98 fi
99
100 #DEBHELPER#
101
102=== modified file 'debian/maas-proxy.postrm'
103--- debian/maas-proxy.postrm 2015-07-03 14:26:39 +0000
104+++ debian/maas-proxy.postrm 2015-08-13 09:54:25 +0000
105@@ -6,7 +6,7 @@
106 rm -rf /var/cache/maas-proxy
107 rm -rf /var/log/maas/proxy
108 rm -rf /var/spool/maas-proxy
109- rm -f /etc/maas/maas-proxy.conf
110+ rm -rf /usr/share/maas/maas-proxy.conf
111 fi
112
113 #DEBHELPER#

Subscribers

People subscribed via source and target branches

to all changes: