[packages/ganeti: 1/2] - fix internal deps in systemd service files - require sudo to run ensure-dirs in systemd services a

Wed Feb 5 15:01:32 CET 2014

commit dbf830ed173d3c825e86a77fb5ff59bf864ff746
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Feb 5 15:00:51 2014 +0100

    - fix internal deps in systemd service files
    - require sudo to run ensure-dirs in systemd services as root

 ganeti.spec   |  8 +++++---
 systemd.patch | 27 +++++++++++++++++----------
 2 files changed, 22 insertions(+), 13 deletions(-)
---

diff --git a/ganeti.spec b/ganeti.spec
index 4e3cbe9..051052f 100644
--- a/ganeti.spec
+++ b/ganeti.spec
@@ -1,7 +1,7 @@
 Summary:	Cluster-based virtualization management software
 Name:		ganeti
 Version:	2.9.3
-Release:	0.3
+Release:	0.4
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://downloads.ganeti.org/releases/2.9/%{name}-%{version}.tar.gz
@@ -82,6 +82,7 @@ Requires:	python-pyparsing
 Requires:	python-simplejson
 Requires:	rc-scripts
 Requires:	socat
+Requires:	sudo
 Requires:	systemd-units >= 0.38
 #Suggests:	ganeti-instance-debootstrap
 Suggests:	qemu
@@ -151,7 +152,7 @@ bash-completion for ganeti.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{systemdunitdir},%{systemdtmpfilesdir}} \
-	$RPM_BUILD_ROOT/etc/{ganeti,cron.d,bash_completion.d,sysconfig,rc.d/init.d}
+	$RPM_BUILD_ROOT/etc/{ganeti,cron.d,bash_completion.d,sysconfig,rc.d/init.d,sudoers.d}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -173,8 +174,8 @@ cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/ganeti
 cp -p doc/examples/bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/ganeti
 cp -p doc/examples/ganeti.cron $RPM_BUILD_ROOT/etc/cron.d/ganeti
 cp -p doc/examples/ganeti.target $RPM_BUILD_ROOT%{systemdunitdir}
-cp -p doc/examples/ganeti.target $RPM_BUILD_ROOT%{systemdunitdir}
 cp -p doc/examples/ganeti-{noded,masterd,rapi,confd,luxid,mond}.service $RPM_BUILD_ROOT%{systemdunitdir}
+cp -p doc/examples/ganeti.sudoers $RPM_BUILD_ROOT/etc/sudoers.d/ganeti
 
 %py_postclean
 
@@ -250,6 +251,7 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/ganeti-noded
 %attr(754,root,root) /etc/rc.d/init.d/ganeti-rapi
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ganeti
+%config(noreplace) %verify(not md5 mtime size) /etc/sudoers.d/ganeti
 %dir %{_sysconfdir}/ganeti
 %{systemdunitdir}/ganeti.target
 %{systemdunitdir}/ganeti-confd.service
diff --git a/systemd.patch b/systemd.patch
index 886c710..8832a24 100644
--- a/systemd.patch
+++ b/systemd.patch
@@ -10,7 +10,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
  	$(userspecs) \
  	lib/_generated_rpc.py \
  	$(man_MANS) \
-@@ -190,7 +190,13 @@
+@@ -190,7 +190,14 @@
  	doc/examples/ganeti.cron \
  	doc/examples/ganeti.initd \
  	doc/examples/gnt-config-backup \
@@ -21,7 +21,8 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +	doc/examples/ganeti-noded.service \
 +	doc/examples/ganeti-luxid.service \
 +	doc/examples/ganeti-mond.service \
-+	doc/examples/ganeti-rapi.service
++	doc/examples/ganeti-rapi.service \
++	doc/examples/ganeti.sudoers
  
  nodist_pkgpython_PYTHON = \
  	$(BUILT_PYTHON_SOURCES)
@@ -37,7 +38,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +[Service]
 +Type=forking
 +EnvironmentFile=-/etc/sysconfig/ganeti
-+ExecStartPre=@PKGLIBDIR@/ensure-dirs
++ExecStartPre=/usr/bin/sudo @PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-confd $CONFD_ARGS
 +User=@GNTCONFDUSER@
 +Group=@GNTCONFDGROUP@
@@ -58,7 +59,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +[Service]
 +Type=forking
 +EnvironmentFile=-/etc/sysconfig/ganeti
-+ExecStartPre=@PKGLIBDIR@/ensure-dirs
++ExecStartPre=/usr/bin/sudo @PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-masterd $MASTERD_ARGS
 +User=@GNTMASTERUSER@
 +Group=@GNTMASTERDGROUP@
@@ -92,14 +93,14 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 @@ -0,0 +1,18 @@
 +[Unit]
 +Description=Ganeti RAPI
-+Requires=ganeti-noded.service ganeti-masterd.service
++Requires=ganeti-noded.service
 +After=ganeti-masterd.service
 +ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +
 +[Service]
 +Type=forking
 +EnvironmentFile=-/etc/sysconfig/ganeti
-+ExecStartPre=@PKGLIBDIR@/ensure-dirs
++ExecStartPre=/usr/bin/sudo @PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-rapi $RAPI_ARGS
 +User=@GNTRAPIUSER@
 +Group=@GNTRAPIGROUP@
@@ -120,7 +121,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +[Service]
 +Type=forking
 +EnvironmentFile=-/etc/sysconfig/ganeti
-+ExecStartPre=@PKGLIBDIR@/ensure-dirs
++ExecStartPre=/usr/bin/sudo @PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-luxid $LUXID_ARGS
 +User=@GNTLUXIDUSER@
 +Group=@GNTLUXIDGROUP@
@@ -134,8 +135,8 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 @@ -0,0 +1,18 @@
 +[Unit]
 +Description=Ganeti mond
-+Requires=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service
-+After=ganeti-rapi.service
++Requires=ganeti-noded.service
++After=ganeti-rapi.service ganeti-masterd.service
 +ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +
 +[Service]
@@ -158,12 +159,18 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +
 +[Install]
 +WantedBy=multi-user.target
+--- ganeti-2.6.2/doc/examples.orig/ganeti.sudoers.in	1970-01-01 01:00:00.000000000 +0100
++++ ganeti-2.6.2/doc/examples/ganeti.sudoers.in	2013-06-01 15:55:37.661561129 +0200
+@@ -0,0 +1,3 @@
++User_Alias GANETI = @GNTCONFDUSER@, @GNTMASTERUSER@, @GNTRAPIUSER@, @GNTLUXIDUSER@
++
++GANETI	ALL=(ALL) NOPASSWD: @PKGLIBDIR@/ensure-dirs
 --- ganeti-2.6.2/doc/examples.orig/README.systemd	1970-01-01 01:00:00.000000000 +0100
 +++ ganeti-2.6.2/doc/examples/README.systemd	2013-06-01 15:55:37.661561129 +0200
 @@ -0,0 +1,14 @@
 +To register the services with ganeti.target (order doesn't matter):
 +
-+    systemctl enable ganeti-noded ganeti-masterd ganeti-rapi
++    systemctl enable ganeti-noded ganeti-masterd ganeti-rapi ganeti-mond
 +
 +To include confd:
 +
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ganeti.git/commitdiff/b17193f6487a192bfde65637fa0d1a9bf290e261

