Add Fix MariaDB/MySQL detection, add my.cnf to mariadb

Author: Lagoja

plugins/builtins.go

@@ -28,8 +28,8 @@ var builtInMap = map[*regexp.Regexp]string{
 	regexp.MustCompile(`^(apache|apacheHttpd)$`):                       "apacheHttpd",
 	regexp.MustCompile(`^(gradle|gradle_[0-9])$`):                      "gradle",
 	regexp.MustCompile(`^(ghc|haskell\.compiler\.(.*))$`):              "haskell",
-	regexp.MustCompile(`^mariadb(-embedded)?_?[0-9]*$`):                "mariadb",
-	regexp.MustCompile(`^mysql?[0-9]*$`):                               "mysql",
+	regexp.MustCompile(`(^mariadb(-embedded)?_?[0-9]*$|^mysql$)`):      "mariadb",
+	regexp.MustCompile(`^mysql(80|57|50)$`):                            "mysql",
 	regexp.MustCompile(`^nodejs(-slim)?_?[0-9]*$`):                     "nodejs",
 	regexp.MustCompile(`^php[0-9]*$`):                                  "php",
 	regexp.MustCompile(`^python3[0-9]*Packages.pip$`):                  "pip",

plugins/mariadb.json

@@ -13,7 +13,8 @@
     "{{ .Virtenv }}/run": "",
     "{{ .Virtenv }}/flake/flake.nix": "mariadb/flake.nix",
     "{{ .Virtenv }}/setup_db.sh": "mariadb/setup_db.sh",
-    "{{ .Virtenv }}/process-compose.yaml": "mariadb/process-compose.yaml"
+    "{{ .Virtenv }}/process-compose.yaml": "mariadb/process-compose.yaml",
+    "{{ .DevboxDir }}/my.cnf": "mariadb/my.cnf"
   },
   "packages": {
     "path:{{ .Virtenv }}/flake": {},

plugins/mariadb/my.cnf

@@ -0,0 +1,4 @@
+# MySQL configuration file
+
+[mariadb]
+log_error=mysql.log

plugins/mariadb/setup_db.sh

@@ -6,3 +6,7 @@ if [ ! -d "$MYSQL_DATADIR" ]; then
         --datadir=$MYSQL_DATADIR --basedir=$MYSQL_BASEDIR \
         --pid-file=$MYSQL_PID_FILE
 fi
+
+if [ -e "$MYSQL_CONF" ]; then
+  ln -fs "$MYSQL_CONF" "$MYSQL_HOME/my.cnf"
+fi

plugins/mysql.json

@@ -1,33 +1,31 @@
 {
-    "name": "mysql",
-    "version": "0.0.4",
-    "description": "* This plugin wraps mysqld and mysql_install_db to work in your local project\n* This plugin will create a new database for your project in MYSQL_DATADIR if one doesn't exist on shell init. This DB will be started in `insecure` mode, so be sure to add a root password after creation if needed.\n* Use mysqld to manually start the server, and `mysqladmin -u root shutdown` to manually stop it",
-    "env": {
-      "MYSQL_BASEDIR": "{{ .DevboxProfileDefault }}",
-      "MYSQL_HOME": "{{ .Virtenv }}/run",
-      "MYSQL_DATADIR": "{{ .Virtenv }}/data",
-      "MYSQL_UNIX_PORT": "{{ .Virtenv }}/run/mysql.sock",
-      "MYSQL_PID_FILE": "{{ .Virtenv }}/run/mysql.pid",
-      "MYSQL_CONF": "{{ .DevboxDir }}/my.cnf"
-    },
-    "create_files": {
-      "{{ .Virtenv }}/run": "",
-      "{{ .Virtenv }}/flake/flake.nix": "mysql/flake.nix",
-      "{{ .Virtenv }}/setup_db.sh": "mysql/setup_db.sh",
-      "{{ .Virtenv }}/process-compose.yaml": "mysql/process-compose.yaml",
-      "{{ .DevboxDir }}/my.cnf": "mysql/my.cnf"
-    },
-    "packages": {
-      "path:{{ .Virtenv }}/flake": {},
-      "glibcLocales": {
-        "version": "latest",
-        "platforms": ["x86_64-linux", "aarch64-linux"]
-      }
-    },
-    "__remove_trigger_package": true,
-    "shell": {
-      "init_hook": [
-        "bash {{ .Virtenv }}/setup_db.sh"
-      ]
+  "name": "mysql",
+  "version": "0.0.4",
+  "description": "* This plugin wraps mysqld and mysql_install_db to work in your local project\n* This plugin will create a new database for your project in MYSQL_DATADIR if one doesn't exist on shell init. This DB will be started in `insecure` mode, so be sure to add a root password after creation if needed.\n* Use mysqld to manually start the server, and `mysqladmin -u root shutdown` to manually stop it",
+  "env": {
+    "MYSQL_BASEDIR": "{{ .DevboxProfileDefault }}",
+    "MYSQL_HOME": "{{ .Virtenv }}/run",
+    "MYSQL_DATADIR": "{{ .Virtenv }}/data",
+    "MYSQL_UNIX_PORT": "{{ .Virtenv }}/run/mysql.sock",
+    "MYSQL_PID_FILE": "{{ .Virtenv }}/run/mysql.pid",
+    "MYSQL_CONF": "{{ .DevboxDir }}/my.cnf"
+  },
+  "create_files": {
+    "{{ .Virtenv }}/run": "",
+    "{{ .Virtenv }}/flake/flake.nix": "mysql/flake.nix",
+    "{{ .Virtenv }}/setup_db.sh": "mysql/setup_db.sh",
+    "{{ .Virtenv }}/process-compose.yaml": "mysql/process-compose.yaml",
+    "{{ .DevboxDir }}/my.cnf": "mysql/my.cnf"
+  },
+  "packages": {
+    "path:{{ .Virtenv }}/flake": {},
+    "glibcLocales": {
+      "version": "latest",
+      "platforms": ["x86_64-linux", "aarch64-linux"]
     }
+  },
+  "__remove_trigger_package": true,
+  "shell": {
+    "init_hook": ["bash {{ .Virtenv }}/setup_db.sh"]
   }
+}