Changeset 33

Timestamp:

01/22/08 18:51:20 (4 years ago)

Author:

bruno

Message:

Create a new pkg dplo-common which handles the account creation + ssh key

Location:

devel

Files:

• dploy-common (added)
• dploy-common/install.sh (added)
• dploy-dhcp/install.sh (modified) (1 diff)
• pbconf/dploy-dhcp/rpm/dploy-dhcp.spec (modified) (2 diffs)

devel/dploy-dhcp/install.sh

@@ -13 +13 @@
 echo "PBPKG PBVER-rPBREV will be installed under $local"
 mkdir -p $local/bin
-install -m 0755 -g dploy -o dploy bin/dploy-add2dhcp $local/bin 
+install -m 0755 bin/dploy-add2dhcp $local/bin 

devel/pbconf/dploy-dhcp/rpm/dploy-dhcp.spec

@@ -14 +14 @@
 Source:         PBSRC
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-Requires:       dhcp-server, sudo, perl, PBDEP
+Requires:       dploy-common, dhcp-server, sudo, perl, PBDEP
 
 %description
@@ -40 +40 @@
 %{_bindir}/*
 
-%pre
-# Create dploy Account and group if needed
-grep -qE '^dploy:' /etc/group
-if [ $? -ne 0 ]; then
-    addgroup dploy
-fi
-grep -qE '^dploy:' /etc/passwd
-if [ $? -ne 0 ]; then
-    adduser dploy dploy
-fi
-
 %post
 # Include our configuration file in std dhcp.conf file
-grep -qE '^include "PBCONF/dhcpd.conf";' /etc/passwd
+grep -qE '^include "PBCONF/dhcpd.conf";' /etc/dhcpd.conf
 if [ $? -ne 0 ]; then
     echo 'include "PBCONF/dhcpd.conf";' >> /etc/dhcpd.conf
 fi
 
+# Include dploy in sudoers
+grep -qE '^dploy ' /etc/sudoers
+if [ $? -ne 0 ]; then
+    echo 'dploy ALL=NOPASSWD: /etc/init.d/dhcpd ?*' >> /etc/dhcpd.conf
+fi
+
 %changelog
 PBLOG