[arch-commits] Commit in mariadb/trunk (PKGBUILD mariadb.install)

[Bartłomiej Piotrowski]

    Date: Saturday, March 7, 2015 @ 15:51:57
  Author: bpiotrowski
Revision: 232979

User/Group management todo

- do not remove mysql user/group after package deletion
- chown /var/lib/mysql inside the PKGBUILD

Modified:
  mariadb/trunk/PKGBUILD
  mariadb/trunk/mariadb.install

-----------------+
 PKGBUILD        |    3 +++
 mariadb.install |   15 ---------------
 2 files changed, 3 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-07 14:28:39 UTC (rev 232978)
+++ PKGBUILD	2015-03-07 14:51:57 UTC (rev 232979)
@@ -140,6 +140,9 @@
   install -Dm644 ../mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
   install -Dm644 ../mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
 
+  install -dm700 var/lib/mysql
+  chown -R 89:89 var/lib/mysql &>/dev/null
+
   # provided by libmariadbclient
   cd "$pkgdir"
   rm usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}

Modified: mariadb.install
===================================================================
--- mariadb.install	2015-03-07 14:28:39 UTC (rev 232978)
+++ mariadb.install	2015-03-07 14:51:57 UTC (rev 232979)
@@ -2,11 +2,6 @@
   groupadd -g 89 mysql &>/dev/null
   useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
 
-  if [[ ! -e var/lib/mysql ]]; then
-    install -dm700 var/lib/mysql
-    chown -R mysql:mysql var/lib/mysql &>/dev/null
-  fi
-
   echo ":: You need to initialize the MariaDB data directory prior to starting"
   echo "   the service. This can be done with mysql_install_db command, e.g.:"
   echo "   mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql"
@@ -36,13 +31,3 @@
     echo "   running mysql_upgrade afterwards."
   fi
 }
-
-post_remove(){
-  if getent passwd mysql >/dev/null 2>&1; then
-    userdel mysql
-  fi
-
-  if getent group mysql >/dev/null 2>&1; then
-    groupdel mysql
-  fi
-}