Merge pull request #15 from JedMeister/16.1-update

16.1 update

Makefile

@@ -1,2 +1,3 @@
 include $(FAB_PATH)/common/mk/turnkey/lamp.mk
+include $(FAB_PATH)/common/mk/turnkey/composer.mk
 include $(FAB_PATH)/common/mk/turnkey.mk

changelog

@@ -1,3 +1,22 @@
+turnkey-cakephp-16.1 (1) turnkey; urgency=low
+
+  * Latest upstream version of CakePHP - v4.2.4.
+
+  * Include 'turnkey-composer' wrapper script - runs composer as www-data
+    user. Makes it easy to not run composer as root - part of #1539. Note by
+    default, /var/www/cakephp is still owned by root. To get full value of
+    'turnkey-composer'::
+
+        chown -R www-data:www-data /var/www/cakephp
+
+  * Explicitly install composer (rather than automatically include in all LAMP
+    based appliances) - part of #1563.
+
+  * Note: Please refer to turnkey-core's 16.1 changelog for changes common to
+    all appliances. Here we only describe changes specific to this appliance.
+
+ -- Jeremy Davis <jeremy@turnkeylinux.org>  Tue, 30 Mar 2021 12:52:37 +1100
+
 turnkey-cakephp-16.0 (1) turnkey; urgency=low
 
   * Latest upstream version of CakePHP - v4.0.7.

conf.d/main

@@ -54,13 +54,8 @@ chmod 640 $CONF
 
 # setup the database
 service mysql start
-
-MYSQL_BATCH="mysql --user=root --password=$MYSQL_PASS --batch"
-MYSQL_ADMIN="mysqladmin --user=root --password=$MYSQL_PASS"
-
-$MYSQL_ADMIN create $DB_NAME
-$MYSQL_BATCH --execute "grant all privileges on $DB_NAME.* to $DB_USER@localhost identified by '$DB_PASS'; flush privileges;"
-
+mysqladmin create $DB_NAME
+mysql --batch --execute "grant all privileges on $DB_NAME.* to $DB_USER@localhost identified by '$DB_PASS'; flush privileges;"
 service mysql stop
 
 # configure apache