Changeset 1226

Timestamp:

01/16/12 22:10:37 (4 months ago)

Author:

tschmitt

Message:

• linuxmuster-setup:
  • Postgresql-Startskriptaufruf gefixt.
  • uid von vboxadd user wird korrigiert.
  • adduser statt useradd zum Anlegen von Systemusern.

Location:

main/linuxmuster-base/branches/testing

Files:

• debian/changelog (modified) (2 diffs)
• sbin/linuxmuster-setup (modified) (1 diff)
• var/config-dynamic/00_stop-services/prepatch (modified) (1 diff)
• var/config-dynamic/15_ldap/postpatch (modified) (1 diff)
• var/config-dynamic/15_ldap/prepatch (modified) (1 diff)

main/linuxmuster-base/branches/testing/debian/changelog

@@ +1 @@
+linuxmuster-base (6.0.0-2ubuntu0) lenny; urgency=low
+
+  * linuxmuster-setup:
+    * using adduser instead of useradd to create system users.
+    * corrects uid of vboxadd user.
+    * fixed postgresql init skript name.
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Mon, 16 Jan 2012 22:08:23 +0100
+
 linuxmuster-base (6.0.0-1ubuntu0) lenny; urgency=low
 
@@ -8 +17 @@
   * server task updates.
 
- -- Thomas Schmitt <schmitt@lmz-bw.de>  Mon, 16 Jan 2012 20:14:08 +0100
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Mon, 16 Jan 2012 20:42:31 +0100
 
 linuxmuster-base (6.0.0-0ubuntu0) lenny; urgency=low

main/linuxmuster-base/branches/testing/sbin/linuxmuster-setup

@@ -98 +98 @@
     fi
 
-    # turn shadow passwords on, deprecated?
+    # turn shadow passwords on
     #shadowconfig on | tee -a $logfile
+    
+    # correct vboxadd
+    id vboxadd &> /dev/null && userdel vboxadd
+    adduser --ingroup daemon --gecos "VirtualBox guest additions user" --system --home /var/run/vboxadd --shell /bin/false vboxadd
+    mkdir -p /var/run/vboxadd
+    chown vboxadd:daemon /var/run/vboxadd
 
     # add cyrus user
-    id cyrus &> /dev/null || useradd -c "Cyrus Mailsystem User" -d /var/spool/cyrus -g mail -m -r -s /bin/sh cyrus | tee -a $logfile
+    id cyrus &> /dev/null || adduser --gecos "Cyrus Mailsystem User" --home /var/spool/cyrus -ingroup mail --system --shell /bin/sh cyrus | tee -a $logfile
+    mkdir -p /var/spool/cyrus
+    chown cyrus:mail /var/spool/cyrus
 
     # install paedml release key

main/linuxmuster-base/branches/testing/var/config-dynamic/00_stop-services/prepatch

@@ -8 +8 @@
           linbo-multicast nagios3 atd cron rembo quota apache2 cups \
           clamav-freshclam clamav-daemon cyrus2.2 postfix saslauthd amavis \
-          mysql openntpd ssh samba slapd postgresql-9.1 nscd portmap \
+          mysql openntpd ssh samba slapd postgresql nscd portmap \
           openbsd-inetd bind9 isc-dhcp-server"
 

main/linuxmuster-base/branches/testing/var/config-dynamic/15_ldap/postpatch

@@ -153 +153 @@
 chmod 700 /var/lib/ldap
 chmod 600 /var/lib/ldap/*
-rm /etc/pam_ldap.secret
+rm -f /etc/pam_ldap.secret
 ln -sf ldap.secret /etc/pam_ldap.secret
 

main/linuxmuster-base/branches/testing/var/config-dynamic/15_ldap/prepatch

@@ -19 +19 @@
 fi
 
-/etc/init.d/postgresql-9.1 start
+/etc/init.d/postgresql start
 
 # clear samba browse cache