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
=== modified file 'debian/changelog'
--- debian/changelog 2015-08-11 10:57:05 +0000
+++ debian/changelog 2015-08-13 09:54:25 +0000
@@ -1,4 +1,4 @@
1maas (1.9.0~alpha1+bzr4177-0ubuntu1) UNRELEASED; urgency=medium1maas (1.9.0~alpha1+bzr4185-0ubuntu1) UNRELEASED; urgency=medium
22
3 * UNRELEASED3 * UNRELEASED
44
@@ -22,6 +22,8 @@
22 * debian/control: Make maas-dns a Dependy of maas-region-controller.22 * debian/control: Make maas-dns a Dependy of maas-region-controller.
23 * Update the location of dhcpd.conf and dhcpd6.conf to be /var/lib/maas/23 * Update the location of dhcpd.conf and dhcpd6.conf to be /var/lib/maas/
24 and handle upgrades. (LP: #1482857)24 and handle upgrades. (LP: #1482857)
25 * Move /etc/maas/maas-proxy.conf to /usr/share/maas/maas-proxy.conf as
26 this is not a config we want users to modify. (LP: #1482859)
2527
26 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 12 Jun 2015 14:16:47 -040028 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 12 Jun 2015 14:16:47 -0400
2729
2830
=== modified file 'debian/extras/maas-proxy-common.sh'
--- debian/extras/maas-proxy-common.sh 2015-06-18 09:10:03 +0000
+++ debian/extras/maas-proxy-common.sh 2015-08-13 09:54:25 +0000
@@ -16,6 +16,6 @@
16 chown -R proxy:proxy /var/log/maas/proxy16 chown -R proxy:proxy /var/log/maas/proxy
17 fi17 fi
18 if [ ! -d /var/cache/maas-proxy/00 ]; then18 if [ ! -d /var/cache/maas-proxy/00 ]; then
19 $SQUID -z -N -f /etc/maas/maas-proxy.conf19 $SQUID -z -N -f /usr/share/maas/maas-proxy.conf
20 fi20 fi
21}21}
2222
=== modified file 'debian/maas-proxy.install'
--- debian/maas-proxy.install 2014-09-21 22:05:31 +0000
+++ debian/maas-proxy.install 2015-08-13 09:54:25 +0000
@@ -1,3 +1,3 @@
1debian/extras/maas-proxy.conf etc/maas/1debian/extras/maas-proxy.conf usr/share/maas/
2debian/extras/maas-proxy-common.sh usr/share/maas/2debian/extras/maas-proxy-common.sh usr/share/maas/
3debian/extras/squid3.override etc/init/3debian/extras/squid3.override etc/init/
44
=== modified file 'debian/maas-proxy.logrotate'
--- debian/maas-proxy.logrotate 2014-09-12 19:10:04 +0000
+++ debian/maas-proxy.logrotate 2015-08-13 09:54:25 +0000
@@ -19,6 +19,6 @@
19 exit 119 exit 1
20 fi20 fi
2121
22 test ! -e /var/run/maas-proxy.pid || $SQUID -f /etc/maas/maas-proxy.conf -k rotate22 test ! -e /var/run/maas-proxy.pid || $SQUID -f /usr/share/maas/maas-proxy.conf -k rotate
23 endscript23 endscript
24}24}
2525
=== modified file 'debian/maas-proxy.maas-proxy.service'
--- debian/maas-proxy.maas-proxy.service 2015-04-24 18:05:29 +0000
+++ debian/maas-proxy.maas-proxy.service 2015-08-13 09:54:25 +0000
@@ -2,14 +2,14 @@
2Description=MAAS Proxy2Description=MAAS Proxy
3Requires=network-online.target3Requires=network-online.target
4After=network-online.target4After=network-online.target
5ConditionPathExists=/etc/maas/maas-proxy.conf5ConditionPathExists=/usr/share/maas/maas-proxy.conf
66
7[Service]7[Service]
8ExecStartPre=/bin/mkdir -p /run/maas/proxy8ExecStartPre=/bin/mkdir -p /run/maas/proxy
9ExecStartPre=/bin/sh -ec '\9ExecStartPre=/bin/sh -ec '\
10 . /usr/share/maas/maas-proxy-common.sh; \10 . /usr/share/maas/maas-proxy-common.sh; \
11 pre_start'11 pre_start'
12ExecStart=/usr/sbin/squid3 -N -f /etc/maas/maas-proxy.conf12ExecStart=/usr/sbin/squid3 -N -f /usr/share/maas/maas-proxy.conf
1313
14[Install]14[Install]
15WantedBy=multi-user.target15WantedBy=multi-user.target
1616
=== modified file 'debian/maas-proxy.maas-proxy.upstart'
--- debian/maas-proxy.maas-proxy.upstart 2014-09-19 19:47:42 +0000
+++ debian/maas-proxy.maas-proxy.upstart 2015-08-13 09:54:25 +0000
@@ -20,5 +20,5 @@
20 echo "No squid binary found"20 echo "No squid binary found"
21 exit 121 exit 1
22 fi22 fi
23 exec $SQUID -N -f /etc/maas/maas-proxy.conf23 exec $SQUID -N -f /usr/share/maas/maas-proxy.conf
24end script24end script
2525
=== modified file 'debian/maas-proxy.postinst'
--- debian/maas-proxy.postinst 2015-04-01 12:41:52 +0000
+++ debian/maas-proxy.postinst 2015-08-13 09:54:25 +0000
@@ -17,6 +17,12 @@
17 mkdir -p /var/log/maas/proxy17 mkdir -p /var/log/maas/proxy
18 chown -R proxy:proxy /var/log/maas/proxy18 chown -R proxy:proxy /var/log/maas/proxy
1919
20 # Move maas-proxy.conf if we are upgrading from an earlier
21 # version that used to ship maas-proxy.conf in /etc/maas.
22 if [ -f /etc/maas/maas-proxy.conf ]; then
23 mv /etc/maas/maas-proxy.conf /usr/share/maas/
24 fi
25
20fi26fi
2127
22#DEBHELPER#28#DEBHELPER#
2329
=== modified file 'debian/maas-proxy.postrm'
--- debian/maas-proxy.postrm 2015-07-03 14:26:39 +0000
+++ debian/maas-proxy.postrm 2015-08-13 09:54:25 +0000
@@ -6,7 +6,7 @@
6 rm -rf /var/cache/maas-proxy6 rm -rf /var/cache/maas-proxy
7 rm -rf /var/log/maas/proxy7 rm -rf /var/log/maas/proxy
8 rm -rf /var/spool/maas-proxy8 rm -rf /var/spool/maas-proxy
9 rm -f /etc/maas/maas-proxy.conf9 rm -rf /usr/share/maas/maas-proxy.conf
10fi10fi
1111
12#DEBHELPER#12#DEBHELPER#

Subscribers

People subscribed via source and target branches

to all changes: