From 6eaf5dbccd75726a606e18446f6c4ea8c4a93536 Mon Sep 17 00:00:00 2001
From: Bachir Soussi Chiadmi <bachir@figureslibres.io>
Date: Tue, 21 Apr 2020 11:49:28 +0200
Subject: [PATCH] removed knockd ufw, added php modules

---
 bin/knockd.sh | 30 ++++++++++++++++--------------
 bin/lemp.sh   |  2 +-
 bin/ufw.sh    |  8 ++++++++
 readme.md     |  4 ++--
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/bin/knockd.sh b/bin/knockd.sh
index c03aabc..e28f721 100755
--- a/bin/knockd.sh
+++ b/bin/knockd.sh
@@ -33,22 +33,24 @@ echo -n "checking if ufw is installed"
 ufw_installed=$(apk list -I | grep "ufw")
 if ! $ufw_installed; then
   echo -n "ufw installed"
+
+  mv /etc/knockd.conf /etc/knockd.conf.ori
+  cp "$_assets"/knockd.conf /etc/knockd.conf
+  echo -n "define a sequence number for opening ssh (as 7000,8000,9000) : "
+  read sq
+  sed -i "s/7000,8000,9000/$sq/g" /etc/knockd.conf
+
+  rc-update add knockd
+  /etc/init.d/knockd start
+
+  ufw delete allow ssh
+
+  echo -e "knockd installed and configured"
+  echo -e "please note this sequence for future ssh knocking"
+  echo "$sq"
 else
   #. bin/ufw.sh
+  echo -n "ufw not installed, needed by knockd, configuration aborted"
 fi
 
-mv /etc/knockd.conf /etc/knockd.conf.ori
-cp "$_assets"/knockd.conf /etc/knockd.conf
-echo -n "define a sequence number for opening ssh (as 7000,8000,9000) : "
-read sq
-sed -i "s/7000,8000,9000/$sq/g" /etc/knockd.conf
-
-rc-update add knockd
-/etc/init.d/knockd start
-
-ufw delete allow ssh
-
-echo -e "knockd installed and configured"
-echo -e "please note this sequence for future ssh knocking"
-echo "$sq"
 sleep 3
diff --git a/bin/lemp.sh b/bin/lemp.sh
index 35e4275..dca538b 100755
--- a/bin/lemp.sh
+++ b/bin/lemp.sh
@@ -74,7 +74,7 @@ echo -e '
 '
 echo -e "Installing PHP 7.0"
 sleep 3
-apk add php7 php7-fpm php7-pdo_mysql php7-opcache php7-curl php7-mbstring php7-zip php7-xml php7-gd php7-mcrypt php7-imagick php7-phar php7-json php7-dom
+apk add php7 php7-fpm php7-pdo_mysql php7-opcache php7-curl php7-mbstring php7-zip php7-xml php7-gd php7-mcrypt php7-imagick php7-phar php7-json php7-dom php7-tokenizer php7-iconv php7-xmlwriter
 
 echo -e "Configuring PHP"
 
diff --git a/bin/ufw.sh b/bin/ufw.sh
index cd76b7b..ffc3772 100755
--- a/bin/ufw.sh
+++ b/bin/ufw.sh
@@ -13,6 +13,14 @@ sleep 2
 
 # TODO use awall instead of ufw ?
 
+# BUG
+# ufw
+# Traceback (most recent call last):
+#   File "/usr/sbin/ufw", line 25, in <module>
+#     import ufw.frontend
+# ModuleNotFoundError: No module named 'ufw'
+
+
 # ufw
 apk add ufw@testing
 ufw allow ssh # knockd will open the ssh port
diff --git a/readme.md b/readme.md
index c1b2e83..5830ad5 100644
--- a/readme.md
+++ b/readme.md
@@ -14,9 +14,9 @@ each alpine linux stable release has it's branch (master is a clone of the last
 - [x] dotfiles
 - [x] user
 - [x] secure openssh
-- [x] Ufw (may be eventualy replaced by awall ?)
+- [ ] Ufw (may be eventualy replaced by awall ?)
 - [x] Fail2ban
-- [x] Knockd
+- [ ] Knockd
 - [x] Mariadb (bug https://bugs.alpinelinux.org/issues/9046)
 - [x] mysql backups
 - [x] php7-fpm (7.2)