Changeset 3369

Timestamp:

Jan 19, 2017, 1:41:02 PM (3 years ago)

Author:

mabarracus

Message:

Fix config files permission

Location:

lliurex-analytics-server/trunk/fuentes/debian

Files:

• control (modified) (1 diff)
• postinst (modified) (3 diffs)
• postrm (modified) (1 diff)

lliurex-analytics-server/trunk/fuentes/debian/control

@@ -9 +9 @@
 Depends: ${shlibs:Depends}, ${misc:Depends},
         debconf (>= 0.5) | debconf-2.0, po-debconf,
-        ucf, python3, python-daemon, apache2, libapache2-mod-php7.0, php7.0-mysql, mysql-server, python-requests, dialog
+        ucf, python3, python-daemon, apache2, libapache2-mod-php7.0, php7.0-mysql, mysql-server, python-requests, dialog, perl
 Recommends:
 Suggests:

lliurex-analytics-server/trunk/fuentes/debian/postinst

@@ -121 +121 @@
             echo "user=$user" >> /etc/lliurex-analytics-server/config_db
             echo "pass=$pass" >> /etc/lliurex-analytics-server/config_db
+            chmod 750 /etc/lliurex-analytics-server/config_db
         fi
         $mysqluser < /usr/lib/analytics-server/analytics.sql
@@ -131 +132 @@
             echo "user=$user" >> /etc/lliurex-analytics-server/config_db
             echo "pass=$pass" >> /etc/lliurex-analytics-server/config_db
-
+            chmod 640 /etc/lliurex-analytics-server/config_db
         fi
     fi
@@ -137 +138 @@
     RES1=$(grep -o '@phpuser@' /usr/lib/analytics-server/analytics/config.php)
     RES2=$(grep -o '@phppass@' /usr/lib/analytics-server/analytics/config.php)
-    
-    if [ -n "${RES1}" -a -n "${RES2}" ]; then
+
+    if [ -f "/usr/lib/analytics-server/analytics/config.php" -a -n "${RES1}" -a -n "${RES2}" ]; then
         sed -i.old -e "s/@phpuser@/$user/g" -e  "s/@phppass@/$pass/g" /usr/lib/analytics-server/analytics/config.php
         rm /usr/lib/analytics-server/analytics/config.php.old
+        chmod 640 /usr/lib/analytics-server/analytics/config.php
+        apachectl_cmd=$(which apachectl)
+        apache_group=$(${apachectl_cmd} -t -D DUMP_RUN_CFG 2>/dev/null|perl -ne '/group:[ ]+name=\"(.*)\"/i && print $1')
+        if [ -z "${apache_group}" ]; then
+            echo "Warning: apache group not detected, falling back to www-data"
+            apache_group="www-data"
+        fi
+        chgrp ${apache_group} /usr/lib/analytics-server/analytics/config.php
     else
         echo "BUG !! WARNING: replace tags @phpuser@ & @phppass@ not found in /usr/lib/analytics-server/analytics/config.php"

lliurex-analytics-server/trunk/fuentes/debian/postrm

@@ -62 +62 @@
         echo "flush privileges;"| ${mysql_cmd} 2>/dev/null
         echo "Database analytics & user ${USER} removed from mysql"
+        if [ -f "/etc/lliurex-analytics-server/config_db" ]; then
+            rm -f /etc/lliurex-analytics-server/config_db
+            rmdir /etc/lliurex-analytics-server
+        else
+            echo "Warning: config_db file not found! "
+        fi
         exit 0
     ;;