Merge pull request #1403 from ZoneMinder/fix_grant

Fix grant

distros/debian/postinst

@@ -3,6 +3,19 @@
 set -e
 
 if [ "$1" = "configure" ]; then
+
+    . /etc/zm/zm.conf
+
+    # The logs can contain passwords, etc... so by setting group root, only www-data can read them, not people in the www-data group.
+	chown www-data:root /var/log/zm
+	chown www-data:www-data /var/lib/zm
+	if [ -z "$2" ]; then
+        chown www-data:www-data /var/cache/zoneminder /var/cache/zoneminder/*
+	fi
+
+    # Do this every time the package is installed or upgraded
+
+    if [ "$ZM_DB_HOST" = "localhost" ]; then
         if [ -e "/etc/init.d/mysql" ]; then 
             #
             # Get mysql started if it isn't
@@ -15,39 +28,26 @@ if [ "$1" = "configure" ]; then
                 # test if database if already present...
                 if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
                     cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
-				echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                    # This creates the user.
+                    echo "grant lock tables, alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost identified by \"${ZM_DB_PASS}\";" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                else
+                    echo "grant lock tables, alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
                 fi
 
+                # Ensure zoneminder is stopped
                 invoke-rc.d zoneminder stop || true
                 zmupdate.pl --nointeractive
-
+                zmupdate.pl --nointeractive -f
+                invoke-rc.d zoneminder start || true
             else
                 echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
             fi
         else 
             echo 'mysql not found, assuming remote server.'
         fi
-	chown www-data:www-data /var/log/zm
+    else
-	chown www-data:www-data /var/lib/zm/
+        echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)"
-	if [ -z "$2" ]; then
-			chown www-data:www-data -R /var/cache/zoneminder
-	fi
-fi
-# Ensure zoneminder is stopped...
-if [ -x "/etc/init.d/zoneminder" ]; then
-        if invoke-rc.d zoneminder status ; then
-                invoke-rc.d zoneminder stop || exit $?
-        fi
     fi
 
-if [ "$1" = "configure" ]; then
-	if [ -z "$2" ]; then
-		chown www-data:www-data /var/log/zm
-		chown www-data:www-data /var/lib/zm/
-		chown www-data:www-data -R /var/cache/zoneminder
-    else
-		chown www-data:www-data /var/log/zm
-		zmupdate.pl
-	fi
 fi
 #DEBHELPER#

distros/ubuntu1204/zoneminder.postinst

@@ -3,10 +3,50 @@
 set -e
 
 if [ "$1" = "configure" ]; then
+
+    . /etc/zm/zm.conf
+
+    # The logs can contain passwords, etc... so by setting group root, only www-data can read them, not people in the www-data group
     chown www-data:root /var/log/zm
     chown www-data:www-data /var/lib/zm
     if [ -z "$2" ]; then
-			chown www-data:www-data -R /var/cache/zoneminder
+        chown www-data:www-data /var/cache/zoneminder /var/cache/zoneminder/*
+    fi
+
+    # Do this every time the package is installed or upgraded
+
+    if [ "$ZM_DB_HOST" = "localhost" ]; then
+        if [ -e "/etc/init.d/mysql" ]; then 
+            #
+            # Get mysql started if it isn't
+            #
+            if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then
+                    invoke-rc.d mysql start
+            fi
+            if $(/etc/init.d/mysql status >/dev/null 2>&1); then
+                mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
+                # test if database if already present...
+                if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
+                    cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
+                    # This creates the user.
+                    echo "grant lock tables, alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost identified by \"${ZM_DB_PASS}\";" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                else
+                    echo "grant lock tables, alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                fi
+
+                # Ensure zoneminder is stopped
+                invoke-rc.d zoneminder stop || true
+                zmupdate.pl --nointeractive
+                zmupdate.pl --nointeractive -f
+                invoke-rc.d zoneminder start || true
+            else
+                echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
+            fi
+        else 
+            echo 'mysql not found, assuming remote server.'
+        fi
+    else 
+        echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)"
     fi
 fi
 

distros/ubuntu1504/zoneminder.postinst

@@ -2,28 +2,57 @@
 
 set -e
 
+if [ "$1" = "configure" ]; then
+
     . /etc/zm/zm.conf
 
-if [ "$1" = "configure" ]; then
+    # The logs can contain passwords, etc... so by setting group root, only www-data can read them, not people in the www-data group
     chown www-data:root /var/log/zm
     chown www-data:www-data /var/lib/zm
     if [ -z "$2" ]; then
-			chown www-data:www-data -R /var/cache/zoneminder
+        chown www-data:www-data /var/cache/zoneminder /var/cache/zoneminder/*
     fi
 
 	# Do this every time the package is installed or upgraded
-	# Test for database presence to avoid failure of zmupdate.pl
+
+	if [ "$ZM_DB_HOST" = "localhost" ]; then
+
+        if [ -e "/etc/init.d/mysql" ]; then
+
+            #
+            # Get mysql started if it isn't
+            #
+            if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then
+                deb-systemd-invoke start mysql.service || exit $?
+            fi
+
+            if $(/etc/init.d/mysql status >/dev/null 2>&1); then
+                mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
+                # test if database if already present...
+                if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
+                    cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
+                    # This creates the user.
+                    echo "grant lock tables,alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost identified by \"${ZM_DB_PASS}\";" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                else
+                    echo "grant lock tables,alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                fi
 
                 # Ensure zoneminder is stopped
                 deb-systemd-invoke stop zoneminder.service || exit $?
-
-	if [ "$ZM_DB_HOST" = "localhost" ]; then
-		echo 'grant lock tables, create, index, alter on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-		# Run the ZoneMinder update tool
                 zmupdate.pl --nointeractive
+                zmupdate.pl --nointeractive -f
+                deb-systemd-invoke start zoneminder.service || exit $?
+
+            else
+                echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
+            fi
+        else
+            echo 'mysql not found, assuming remote server.'
+        fi
+
     else
 		echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)"
- 	fi;
+    fi
 
 fi