diff --git a/bin/knockd.sh b/bin/knockd.sh index 9f387c4..c03aabc 100755 --- a/bin/knockd.sh +++ b/bin/knockd.sh @@ -34,7 +34,7 @@ ufw_installed=$(apk list -I | grep "ufw") if ! $ufw_installed; then echo -n "ufw installed" else - . bin/ufw.sh + #. bin/ufw.sh fi mv /etc/knockd.conf /etc/knockd.conf.ori diff --git a/bin/lemp.sh b/bin/lemp.sh index 6d1db8a..94dbc61 100755 --- a/bin/lemp.sh +++ b/bin/lemp.sh @@ -38,7 +38,7 @@ sleep 3 apk add mariadb mariadb-client mariadb-common # https://bugs.alpinelinux.org/issues/9046 -echo -n "are Maridb databases strored in a zfs file system? [y|n] " +echo -n "are Maridb databases strored in a zfs file system (eg. through proxmox container)? [y|n] " read yn if [ "$yn" = "Y" ] || [ "$yn" = "y" ]; then echo -e "Stick with mariadb 10.1.x due to incompatibility of newer version with zfs" diff --git a/bin/zabbix.sh b/bin/zabbix.sh index 3a027ab..95f863b 100755 --- a/bin/zabbix.sh +++ b/bin/zabbix.sh @@ -88,7 +88,7 @@ mkdir /etc/zabbix/zabbix_agentd.scripts cp "$_assets"/zabbix/scripts/nginx-stat.py /etc/zabbix/zabbix_agentd.scripts/ chmod +x /etc/zabbix/zabbix_agentd.scripts/nginx-stat.py -echo -n "This is box is a proxmox CT? [Y|n] " +echo -n "Is This box a proxmox CT? [Y|n] " read yn yn=${yn:-y} if [ "$yn" = "Y" ] || [ "$yn" = "y" ]; then diff --git a/install.sh b/install.sh index 55b55a4..e5c1c03 100755 --- a/install.sh +++ b/install.sh @@ -34,7 +34,7 @@ _cwd="$(pwd)" . bin/email.sh . bin/lemp.sh . bin/mysqlbackup.sh - whie [ "$vh" != "y" ] && [ "$vh" != "n" ] + while [ "$vh" != "y" ] && [ "$vh" != "n" ] do echo -n "Should we install a vhost? [y|n] " read vh diff --git a/readme.md b/readme.md index 26736c0..9731b57 100644 --- a/readme.md +++ b/readme.md @@ -20,16 +20,15 @@ each alpine linux stable release has it's branch (master is a clone of the last - [x] Mariadb (bug https://bugs.alpinelinux.org/issues/9046) - [x] mysql backups - [x] php7-fpm (7.2) +- [x] redis - [x] Nginx - [x] drush - [x] composer -- [x] letsencrypt - [x] vhosts -- [x] redis +- [x] letsencrypt - [x] zabbix-agent (3.4 || 4) - [x] urbackup-client - [x] passwd generator -- [x] urbackup - [ ] solr - [ ] git barre repos - [ ] Proftpd