Changeset 1223

Timestamp:

01/16/12 20:42:26 (4 months ago)

Author:

tschmitt

Message:

• linuxmuster-setup:
  • Setup-Logging erhöht.
  • Webmin entfernt.

Location:

main/linuxmuster-base/branches/testing

Files:

• debian/changelog (modified) (1 diff)
• var/config-dynamic/00_stop-services/prepatch (modified) (1 diff)
• var/config-dynamic/01_network/postpatch (modified) (1 diff, 1 prop)
• var/config-dynamic/01_network/prepatch (modified) (1 diff, 1 prop)
• var/config-dynamic/02_certificates/postpatch (modified) (1 diff, 1 prop)
• var/config-dynamic/03_dhcp3-server/postpatch (modified) (1 diff)
• var/config-dynamic/04_bind9/postpatch (modified) (1 diff, 1 prop)
• var/config-dynamic/04_bind9/prepatch (modified) (1 diff, 1 prop)
• var/config-dynamic/05_mysql/prepatch (modified) (1 diff, 1 prop)
• var/config-dynamic/15_ldap/postpatch (modified) (1 diff)
• var/config-dynamic/15_ldap/prepatch (modified) (1 diff, 1 prop)
• var/config-dynamic/16_mail/postpatch (modified) (1 diff, 1 prop)
• var/config-dynamic/16_mail/prepatch (modified) (1 diff, 1 prop)
• var/config-dynamic/17_admins/postpatch (modified) (1 diff, 1 prop)
• var/config-dynamic/17_admins/prepatch (modified) (2 diffs, 1 prop)
• var/config-dynamic/18_quota/postpatch (modified) (1 diff, 1 prop)
• var/config-dynamic/18_quota/prepatch (modified) (1 diff, 1 prop)
• var/config-dynamic/19_pykota/prepatch (modified) (1 diff, 1 prop)
• var/config-dynamic/21_horde3/prepatch (modified) (1 diff, 1 prop)
• var/config-dynamic/23_apache2/prepatch (modified) (1 diff, 1 prop)
• var/config-dynamic/34_cups/postpatch (modified) (1 diff, 1 prop)
• var/config-dynamic/34_cups/prepatch (modified) (1 diff, 1 prop)
• var/config-dynamic/40_linbo/prepatch (modified) (2 diffs)
• var/config-dynamic/50_webmin (deleted)
• var/config-dynamic/99_start-services/postpatch (modified) (1 diff, 1 prop)
• var/config-dynamic/99_start-services/prepatch (modified) (1 diff, 1 prop)

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

@@ -4 +4 @@
     * removed shadowconfig on first time installation.
     * removed moodle configuration.
+    * removed webmin configuration.
+    * increased logging.
   * server task updates.
 
- -- Thomas Schmitt <schmitt@lmz-bw.de>  Mon, 16 Jan 2012 20:02:50 +0100
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Mon, 16 Jan 2012 20:14:08 +0100
 
 linuxmuster-base (6.0.0-0ubuntu0) lenny; urgency=low

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

@@ -2 +2 @@
 #
 # stop all relevant services
+
+echo "### 00_stop-services prepatch"
 
 services="linuxmuster-base tftpd-hpa bittorrent rsync linbo-bittorrent \

main/linuxmuster-base/branches/testing/var/config-dynamic/01_network/postpatch

@@ +1 @@
+# $Id$
+
+echo "### 01_network postpatch"
+
 # delete interfaces template after patching
 [ -e interfaces ] && rm interfaces

main/linuxmuster-base/branches/testing/var/config-dynamic/01_network/prepatch

@@ +1 @@
+# "$Id"
+
+echo "### 01_network prepatch"
+
 # stop networking at all
 /etc/rcS.d/S40networking stop 1>> $LOGDIR/setup.log 2>> $LOGDIR/setup.log

main/linuxmuster-base/branches/testing/var/config-dynamic/02_certificates/postpatch

@@ +1 @@
+# $Id$
+
+echo "### 02_certificates postpatch"
+
 # make script executable
 chmod 744 $SCRIPTSDIR/create-ssl-cert.sh

main/linuxmuster-base/branches/testing/var/config-dynamic/03_dhcp3-server/postpatch

@@ -1 +1 @@
 # $Id$
+
+echo "### 03_dhcp3-server postpatch"
 
 # patch internal interface

main/linuxmuster-base/branches/testing/var/config-dynamic/04_bind9/postpatch

@@ +1 @@
+# $Id$
+
+echo "### 04_bind9 postpatch"
+
 # fix permissions
 chown root:bind /etc/bind

main/linuxmuster-base/branches/testing/var/config-dynamic/04_bind9/prepatch

@@ +1 @@
+# $Id$
+
+echo "### 04_bind9 prepatch"
+
 if [ "$1" = "--modify" ]; then
 

main/linuxmuster-base/branches/testing/var/config-dynamic/05_mysql/prepatch

@@ +1 @@
+# $Id$
+
+echo "### 05_mysql prepatch"
+
 /etc/init.d/mysql start
 

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

@@ -1 +1 @@
 # $Id$
+
+echo "### 15_ldap postpatch"
 
 # set samba sid

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

@@ -1 +1 @@
 # $Id$
+
+echo "### 15_ldap prepatch"
 
 if [ "$1" = "--first" ]; then

main/linuxmuster-base/branches/testing/var/config-dynamic/16_mail/postpatch

@@ +1 @@
+# $Id$
+
+echo "### 16_mail postpatch"
+
 # activate mail aliases for teachers
 sophomorix-class --class teachers --mailalias

main/linuxmuster-base/branches/testing/var/config-dynamic/16_mail/prepatch

@@ +1 @@
+# $Id$
+
+echo "### 16_mail prepatch"
+
 # repair permissions and group memberships
 dpkg-statoverride --force --update --add cyrus postfix 750 /var/run/cyrus/socket &> /dev/null

main/linuxmuster-base/branches/testing/var/config-dynamic/17_admins/postpatch

@@ +1 @@
+# $Id$
+
+echo "### 17_admins postpatch"
+
 # permissions of samba folders
 for i in $NETLOGONDIR $PROGSDIR $CDSDIR; do

main/linuxmuster-base/branches/testing/var/config-dynamic/17_admins/prepatch

@@ +1 @@
+# $Id$
+
+echo "### 17_admins prepatch"
+
 # create admin users & groups
 
@@ -22 +26 @@
    sophomorix-usermod -I wwwadmin
   else
+   for i in $ADMINISTRATOR $PGMADMIN $WWWADMIN; do
+    mkdir -p $ADMINSHOME/$i
+    chown $i:$ADMINGROUP $ADMINSHOME/$i
+   done
    echo -e "$adminpw\n$adminpw\n" | smbldap-passwd -s $DOMADMIN
    echo -e "$adminpw\n$adminpw\n" | smbldap-passwd -s $ADMINISTRATOR

main/linuxmuster-base/branches/testing/var/config-dynamic/18_quota/postpatch

@@ +1 @@
+# $Id$
+
+echo "### 18_quota postpatch"
+
 # start service
 /etc/init.d/quota start

main/linuxmuster-base/branches/testing/var/config-dynamic/18_quota/prepatch

@@ +1 @@
+# $Id$
+
+echo "### 18_quota prepatch"
+
 if [ "$1" = "--modify" ]; then
         # prevent warnquota.conf from being patched

main/linuxmuster-base/branches/testing/var/config-dynamic/19_pykota/prepatch

@@ +1 @@
+# $Id$
+
+echo "### 19_pykota prepatch"
+
 if [ "$1" = "--first" ]; then
  if dpkg -l | grep linuxmuster-pk | grep -q ^i; then

main/linuxmuster-base/branches/testing/var/config-dynamic/21_horde3/prepatch

@@ +1 @@
+# $Id$
+
+echo "### 21_horde3 prepatch"
+
 # do this only if horde3 is installed
 if dpkg -L horde3 &> /dev/null; then

main/linuxmuster-base/branches/testing/var/config-dynamic/23_apache2/prepatch

@@ +1 @@
+# $Id$
+
+echo "### 23_apache2 prepatch"
+
 # enable necessary modules
 if [ -d /etc/apache2/mods-available ] &&  [ -d /etc/apache2/mods-enabled ]; then

main/linuxmuster-base/branches/testing/var/config-dynamic/34_cups/postpatch

@@ +1 @@
+# $Id$
+
+echo "### 34_cups postpatch"
+
 # start service
 /etc/init.d/cups start

main/linuxmuster-base/branches/testing/var/config-dynamic/34_cups/prepatch

@@ +1 @@
+# $Id$
+
+echo "### 34_cups prepatch"
+
 if [ "$1" = "--modify" ]; then
 

main/linuxmuster-base/branches/testing/var/config-dynamic/40_linbo/prepatch

@@ -1 +1 @@
 # $Id$
-#
+
+echo "### 40_linbo prepatch"
 
 dpkg-reconfigure linuxmuster-linbo
@@ -84 +85 @@
    smbldap-useradd -a -c "LINBO Administrator" -N LINBO -S Administrator -s /bin/false -g $ADMINGROUP -d $ADMINSHOME/linbo -m linbo
    echo -e "$linbopasswd\n$linbopasswd\n" | smbldap-passwd -s linbo
+   mkdir -p $ADMINSHOME/linbo
+   chown linbo:$ADMINGROUP $ADMINSHOME/linbo
   fi
   smbldap-usermod -H '[UX         ]' linbo || true

main/linuxmuster-base/branches/testing/var/config-dynamic/99_start-services/postpatch

@@ -1 +1 @@
 # $Id$
+
+echo "### 99_start-services postpatch"
+
 # repair permissions for root's scheduled cron jobs
 chown root:crontab /var/spool/cron/crontabs/root

main/linuxmuster-base/branches/testing/var/config-dynamic/99_start-services/prepatch

@@ +1 @@
+# $Id$
+
+echo "### 99_start-services prepatch"
+
 if [ "$1" != "--first" ]; then
         if [ "$serverip" != "$serverip_old" ]; then