Merge pull request #330 from JedMeister/more-19.x-updates

More 19.x updates

Author: JedMeister

conf/turnkey.d/webmin-handy-log

@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 
 # set up convenience links to Webmin log files
 
@@ -7,7 +7,7 @@ WEBMIN_LOG=/var/log/webmin
 
 mkdir -p $WEBMIN_LOG
 
-files="miniserv.log miniserv.error webmin.log"
-for f in $files; do
-    ln -s $WEBMIN_VAR/$f $WEBMIN_LOG/$f
+files=(miniserv.error webmin.log)
+for f in "${files[@]}"; do
+    ln -s "$WEBMIN_VAR/$f" "$WEBMIN_LOG/$f"
 done

removelists-final/turnkey

@@ -1,6 +1,20 @@
 # rm apt proxy conf
 /etc/apt/apt.conf.d/01proxy
 
+# clean apt cache
+/var/cache/apt/archives/
+!/var/cache/apt/archives/partial
+
+# clean tmp key files
+/etc/apt/trusted.gpg~
+/etc/apt/trusted.gpg.d/*.gpg~
+
+# clean apt related logs
+/var/log/dpkg.log
+/var/log/bootstrap.log
+/var/log/apt/term.log
+/var/log/apt/history.log
+
 # rm composer auth token
 /root/.composer/auth.json
 /var/www/.composer/auth.json
@@ -16,9 +30,6 @@
 # rm bashlib
 /usr/local/src/tkl-bashlib
 
-# rm gh_releases
-/usr/local/bin/gh_releases
-
 # rm tmp contents
 ~/tmp/*
 ~/tmp/.*

removelists/turnkey

@@ -1,12 +1,3 @@
 /etc/resolvconf/resolv.conf.d/original
 
-/etc/apt/trusted.gpg~
-/etc/apt/trusted.gpg.d/debian.gpg~
-/etc/apt/trusted.gpg.d/turnkey.gpg~
-
-/var/log/dpkg.log
-/var/log/bootstrap.log
-/var/log/apt/term.log
-/var/log/apt/history.log
-
 /var/www/html