Merge pull request #16 from JedMeister/16.0-update

16.0 update

README.rst

@@ -93,25 +93,24 @@ Credentials *(passwords set at first boot)*
 -  Adminer: username **adminer**
 -  Drupal 7: username **admin**
 
-.. _Drupal: http://drupal.org
+.. _Drupal: https://drupal.org
 .. _TurnKey Core: https://www.turnkeylinux.org/core
 .. _Security Alerts: https://www.turnkeylinux.org/docs/automatic-security-alerts
-.. _Admin menu: http://drupal.org/project/admin_menu
+.. _Admin menu: https://drupal.org/project/admin_menu
 .. _Admin views: https://www.drupal.org/project/admin_views
-.. _Advanced\_help: http://drupal.org/project/advanced_help
-.. _Backup and migrate: http://drupal.org/project/backup_migrate
-.. _Ckeditor: http://drupal.org/project/ckeditor
+.. _Advanced\_help: https://drupal.org/project/advanced_help
+.. _Backup and migrate: https://drupal.org/project/backup_migrate
+.. _Ckeditor: https://drupal.org/project/ckeditor
 .. _Colorbox: https://www.drupal.org/project/colorbox
-.. _Drush: http://drupal.org/project/drush
+.. _Drush: https://drupal.org/project/drush
 .. _Field group: https://www.drupal.org/project/field_group
-.. _GlobalRedirect: http://drupal.org/project/globalredirect
-.. _Google analytics: http://drupal.org/project/google_analytics
+.. _GlobalRedirect: https://drupal.org/project/globalredirect
+.. _Google analytics: https://drupal.org/project/google_analytics
 .. _Honeypot: https://www.drupal.org/project/honeypot
-.. _Imce: http://drupal.org/project/imce
+.. _Imce: https://drupal.org/project/imce
 .. _Module filter: https://www.drupal.org/project/module_filter
-.. _PathAuto: http://drupal.org/project/pathauto
-.. _Rules: http://drupal.org/project/rules
-.. _Token: http://drupal.org/project/token
+.. _PathAuto: https://drupal.org/project/pathauto
+.. _Rules: https://drupal.org/project/rules
+.. _Token: https://drupal.org/project/token
 .. _Views: https://www.drupal.org/project/views
-.. _Adminer: http://www.adminer.org
-
+.. _Adminer: https://www.adminer.org

changelog

@@ -1,3 +1,29 @@
+turnkey-drupal7-16.0 (1) turnkey; urgency=low
+
+  * Update Drupal7 to latest upstream version - 7.72. Resolves a number of
+    security related issues.
+
+  * Update Drush to latest v8.x - 8.4.0.
+
+  * Explcitly disable TLS<1.2 (i.e. SSLv3, TLSv1, TLSv1.1). (v15.x
+    TurnKey releases supported TLS 1.2, but could fallback as low as TLSv1).
+
+  * Update SSL/TLS cyphers to provide "Intermediate" browser/client support
+    (suitable for "General-purpose servers with a variety of clients,
+    recommended for almost all systems"). As provided by Mozilla via
+    https://ssl-config.mozilla.org/.
+
+  * Updated all relevant Debian packages to Buster/10 versions; including
+    PHP 7.3.
+
+  * Updated version of mysqltuner script - now installed as per upstream
+    recommendation.
+
+  * Note: Please refer to turnkey-core's changelog for changes common to all
+    appliances. Here we only describe changes specific to this appliance.
+
+ -- Jeremy Davis <jeremy@turnkeylinux.org>  Fri, 31 Jul 2020 17:24:09 +1000
+
 turnkey-drupal7-15.4 (1) turnkey; urgency=low
 
   * Update Drupal7 to latest upstream version - 7.67. Resolves:

conf.d/main

@@ -14,11 +14,12 @@ WEBROOT=/var/www/drupal7
 [ "$FAB_HTTP_PROXY" ] && export HTTP_PROXY=$FAB_HTTP_PROXY
 
 # increase php cli & apache memory limits (cli for drush)
-sed -i "s|^memory_limit.*|memory_limit = 76M|" /etc/php/7.0/cli/php.ini
-sed -i "s|^memory_limit.*|memory_limit = 64M|" /etc/php/7.0/apache2/php.ini
+sed -i "s|^memory_limit.*|memory_limit = 76M|" /etc/php/7.3/cli/php.ini
+sed -i "s|^memory_limit.*|memory_limit = 64M|" /etc/php/7.3/apache2/php.ini
 
-# install drush latest 7.x
-git clone -b 7.x --depth 1 https://github.com/drush-ops/drush.git $SRC/drush
+# install drush latest 8.x
+# (9.x can only be installed as a Drupal8/9 dependency)
+git clone -b 8.x --depth 1 https://github.com/drush-ops/drush.git $SRC/drush
 cd $SRC/drush
 composer install
 ln -s $SRC/drush/drush /usr/local/bin/drush
@@ -61,6 +62,7 @@ with open('$DEFAULT_CONF', 'r') as fob:
             config.extend(db_config.split('\n'))
         else:
             config.append(line)
+config.append('') # ensure new line at end of conf
 
 with open('$CONF', 'w') as fob:
     fob.write('\n'.join(config))
@@ -70,10 +72,16 @@ chown www-data:www-data $CONF
 
 service mysql start
 
+MYSQL_BATCH="mysql --user=root --password=$MYSQL_PASS --batch"
+MYSQL_ADMIN="mysqladmin --user=root"
+
+$MYSQL_ADMIN create $DB_NAME
+$MYSQL_BATCH --execute "grant all privileges on $DB_NAME.* to $DB_USER@localhost identified by '$DB_PASS'; flush privileges;"
+
 drush site-install standard -y \
     --account-name=$ADMIN_NAME \
     --account-pass=$ADMIN_PASS \
-    --site-name="TurnKey Drupal7" --db-su=root --db-su-pw=$MYSQL_PASS --db-url=mysql://$DB_USER:$DB_PASS@localhost/$DB_NAME
+    --site-name="TurnKey Drupal7"
 
 chown root:www-data $CONF
 chmod 640 $CONF