[Piuparts-commits] [SCM] piuparts git repository branch, bikeshed, updated. 0.51-22-g9147fc5
Holger Levsen
holger at layer-acht.org
Tue May 21 11:06:02 UTC 2013
The following commit has been merged in the bikeshed branch:
commit 9a0529cb25321fd5be59c0b8eee2768556bad420
Author: Holger Levsen <holger at layer-acht.org>
Date: Fri May 17 15:50:34 2013 +0200
update TODO
update TODO and add some comments to Makefile after reviewing
master+slave packages.
diff --git a/Makefile b/Makefile
index 51f8e22..b803ebb 100644
--- a/Makefile
+++ b/Makefile
@@ -80,10 +80,12 @@ install-conf: build-stamp
install -d $(DESTDIR)$(etcdir)/cron.d
install -m 0644 conf/crontab-master $(DESTDIR)$(etcdir)/cron.d/piuparts-master
install -m 0644 conf/crontab-slave $(DESTDIR)$(etcdir)/cron.d/piuparts-slave
+ # disable shipped crontabs
sed -i -r '/^[^#]+/s/^/#/' $(DESTDIR)$(etcdir)/cron.d/piuparts-*
install -d $(DESTDIR)$(etcdir)/sudoers.d
install -m 440 conf/piuparts.sudoers $(DESTDIR)$(etcdir)/sudoers.d/piuparts
+ # disable shipped sudoers
sed -i -r '/^[^#]+/s/^/#/' $(DESTDIR)$(etcdir)/sudoers.d/piuparts
install -d $(DESTDIR)$(etcdir)/apache2/conf.d
diff --git a/TODO b/TODO
index f4a0a14..9567000 100644
--- a/TODO
+++ b/TODO
@@ -8,11 +8,9 @@ wishlist!
for 0.5x:
- make piuparts-master + piuparts-slave packages work out-of-the-box:
- - piuparts-slave.postrm purge: clean up /var/cache/piuparts/tmp/
- - conf/piuparts.sudoers is only needed for slave package.
- - ship sane minimal sudoers in p-s.deb than can be enabled by default do we
- really need anything else than running piuparts and piuparts_slave_*
- as root? No, we don't.
+ - enable sudoers.d/piuparts-slave in p-s.deb:
+ - there should be a high prio debconf question asking the user whether
+ to enable the slave and this sudoers config - defaulting to no.
- the shipped crontabs are not suitable from cron.d/ due to missing user
column - discuss this with DSA
- verify that all scripts in $user/bin/ also work from master-slave packages
--
piuparts git repository
More information about the Piuparts-commits
mailing list