Merge pull request #227 from almumontiel/umd4_mariadb

mysql server: Allow daemon name to be configured

Author: jrha

features/mysql/server.pan

@@ -1,52 +1,24 @@
-
 unique template features/mysql/server;
 
-# Include RPMs for MySQL server
-'/software/packages/{mariadb-server}' = nlist();
-
-# ----------------------------------------------------------------------------
-# chkconfig
-# ----------------------------------------------------------------------------
-include { 'components/chkconfig/config' };
+include 'components/chkconfig/config';
+include 'components/etcservices/config';
 
+# Include RPMs for MySQL server
+'/software/packages' = pkg_repl('mariadb-server');
 
-# ----------------------------------------------------------------------------
 # Enable and start MySQL service
-# ----------------------------------------------------------------------------
-"/software/components/chkconfig/service/mariadbd/on" = "";
-"/software/components/chkconfig/service/mariadbd/startstop" = true;
-
-
-# ----------------------------------------------------------------------------
-# iptables
-# ----------------------------------------------------------------------------
-#include { 'components/iptables/config' };
-
-# Inbound port(s).
-# Port 3306.  Probably should limit to localhost traffic for most services.
-
-# Outbound port(s).
-
-
-# ----------------------------------------------------------------------------
-# etcservices
-# ----------------------------------------------------------------------------
-include { 'components/etcservices/config' };
-
-"/software/components/etcservices/entries" =
-  push("mariadb 3306/tcp");
-"/software/components/etcservices/entries" =
-  push("mariadb 3306/udp");
-
-
-# ----------------------------------------------------------------------------
-# cron
-# ----------------------------------------------------------------------------
-#include { 'components/cron/config' };
-
-
-# ----------------------------------------------------------------------------
-# altlogrotate
-# ----------------------------------------------------------------------------
-#include { 'components/altlogrotate/config' };
-
+variable DAEMON_MYSQL ?= "mariadb";
+
+"/software/components/chkconfig/service" ?= dict();
+"/software/components/chkconfig/service" = merge(SELF, dict(
+    DAEMON_MYSQL, dict(
+        'on', '',
+        'startstop', true,
+    ),
+));
+
+"/software/components/etcservices/entries" ?= list();
+"/software/components/etcservices/entries" = merge(SELF, list(
+    "mariadb 3306/tcp",
+    "mariadb 3306/udp",
+));