Changeset 843

Timestamp:

09/06/10 12:15:34 (17 months ago)

Author:

tschmitt

Message:

• update-logins.sh, Fix: Logins mit id < 10000 wurden nicht gelistet (#204).
• postinst: Moodles ldap host url wird ggf. nach  http://localhost geändert.

Location:

main/linuxmuster-base/tags/1.5.3.3

Files:

• debian/changelog (modified) (1 diff)
• debian/postinst (modified) (1 diff)
• share/scripts/update-logins.sh (modified) (1 diff)

main/linuxmuster-base/tags/1.5.3.3/debian/changelog

@@ +1 @@
+linuxmuster-base (1.5.3.3-etch9) etch; urgency=low
+
+  * update-logins.sh: fixed logins with id < 10000 (#204).
+  * postinst: fixing moodle's ldap host url (#284).
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Mon,  6 Sep 2010 12:03:21 +0200
+
 linuxmuster-base (1.5.3.3-etch8) etch; urgency=low
 

main/linuxmuster-base/tags/1.5.3.3/debian/postinst

@@ -515 +515 @@
 
    # repairing moodle
-   if [ -e /etc/moodle/config.php ]; then
-    if ! grep -q "\$CFG->wwwroot = '/moodle';" /etc/moodle/config.php; then
-     cp /etc/moodle/config.php /etc/moodle/config.php.dpkg-old
-     sed -e "s/\$CFG->wwwroot =.*/\$CFG->wwwroot = \'\/moodle\';/g" -i /etc/moodle/config.php
-    fi
-   fi
-   if [ -d /usr/share/moodle ]; then
-    [[ -e /usr/share/moodle/moodle && ! -L /usr/share/moodle/moodle ]] && mv /usr/share/moodle/moodle /usr/share/moodle/moodle.dpkg-old
-    [ -L /usr/share/moodle/moodle ] || ln -s . /usr/share/moodle/moodle
+   if psql -U postgres -qtl | grep -q moodle; then
+    if [ -e /etc/moodle/config.php ]; then
+     if ! grep -q "\$CFG->wwwroot = '/moodle';" /etc/moodle/config.php; then
+      cp /etc/moodle/config.php /etc/moodle/config.php.dpkg-old
+      sed -e "s/\$CFG->wwwroot =.*/\$CFG->wwwroot = \'\/moodle\';/g" -i /etc/moodle/config.php
+     fi
+    fi
+    if [ -d /usr/share/moodle ]; then
+     [[ -e /usr/share/moodle/moodle && ! -L /usr/share/moodle/moodle ]] && mv /usr/share/moodle/moodle /usr/share/moodle/moodle.dpkg-old
+     [ -L /usr/share/moodle/moodle ] || ln -s . /usr/share/moodle/moodle
+    fi
+    # repairing ldap host url (#284)
+    hosturl="$(psql -U postgres -d moodle -qtc "SELECT value FROM mdl_config_plugins WHERE name = 'host_url'")"
+    if [ "$hosturl" != " ldap://localhost" ]; then
+     echo "Repairing moodle's ldap host url ..."
+     psql -U postgres -d moodle -qc "UPDATE mdl_config_plugins SET value = 'ldap://localhost' WHERE name = 'host_url';"
+    fi
    fi
 

main/linuxmuster-base/tags/1.5.3.3/share/scripts/update-logins.sh

@@ -48 +48 @@
   msg=false
   # read smbstatus file and grep logins from it
-  grep ^[1-9] $status | while read line; do
+  grep "!^\s*![1-9]" $status | while read line; do
    machine="$(echo $line | awk '{ print $4 }')"
    echo $hosts | grep -qw $machine || continue