From 3546724fbc9ee946a951f210355c05ee5b67df6c Mon Sep 17 00:00:00 2001
From: Bachir Soussi Chiadmi <bachir@figureslibres.io>
Date: Mon, 30 Mar 2020 12:37:46 +0200
Subject: [PATCH] improved vhost

---
 bin/lemp.sh  | 101 ---------------------------------------------------
 bin/vhost.sh |   5 ++-
 2 files changed, 3 insertions(+), 103 deletions(-)

diff --git a/bin/lemp.sh b/bin/lemp.sh
index a58097b..92d4cea 100755
--- a/bin/lemp.sh
+++ b/bin/lemp.sh
@@ -198,104 +198,3 @@ chmod +x /usr/local/bin/drupal
 curl https://github.com/drush-ops/drush-launcher/releases/download/0.6.0/drush.phar -L -o /usr/local/bin/drush
 chmod +x /usr/local/bin/drush
 echo -e "\033[92;1mDrush and DrupalConsoleinstalled\033[Om"
-
-
-
-# TODO supervising
-# echo -e '\033[35m
-#    __  ___          _ __      __  __  ___          _
-#   /  |/  /__  ___  (_) /_   _/_/ /  |/  /_ _____  (_)__
-#  / /|_/ / _ \/ _ \/ / __/ _/_/  / /|_/ / // / _ \/ / _ \
-# /_/  /_/\___/_//_/_/\__/ /_/   /_/  /_/\_,_/_//_/_/_//_/
-# \033[0m'
-# echo -e "\033[35;1mInstalling Munin \033[0m"
-# sleep 3
-# # https://www.howtoforge.com/tutorial/server-monitoring-with-munin-and-monit-on-debian/
-# apt-get --yes install munin munin-node munin-plugins-extra
-# # Configure Munin
-# # enable plugins
-# ln -s /usr/share/munin/plugins/mysql_ /etc/munin/plugins/mysql_
-# ln -s /usr/share/munin/plugins/mysql_bytes /etc/munin/plugins/mysql_bytes
-# ln -s /usr/share/munin/plugins/mysql_innodb /etc/munin/plugins/mysql_innodb
-# ln -s /usr/share/munin/plugins/mysql_isam_space_ /etc/munin/plugins/mysql_isam_space_
-# ln -s /usr/share/munin/plugins/mysql_queries /etc/munin/plugins/mysql_queries
-# ln -s /usr/share/munin/plugins/mysql_slowqueries /etc/munin/plugins/mysql_slowqueries
-# ln -s /usr/share/munin/plugins/mysql_threads /etc/munin/plugins/mysql_threads
-#
-# ln -s /usr/share/munin/plugins/apache_accesses /etc/munin/plugins/
-# ln -s /usr/share/munin/plugins/apache_processes /etc/munin/plugins/
-# ln -s /usr/share/munin/plugins/apache_volume /etc/munin/plugins/
-#
-# # ln -s /usr/share/munin/plugins/fail2ban /etc/munin/plugins/
-#
-# # dbdir, htmldir, logdir, rundir, and tmpldir
-# sed -i 's/^#dbdir/dbdir/' /etc/munin/munin.conf
-# sed -i 's/^#htmldir/htmldir/' /etc/munin/munin.conf
-# sed -i 's/^#logdir/logdir/' /etc/munin/munin.conf
-# sed -i 's/^#rundir/rundir/' /etc/munin/munin.conf
-# sed -i 's/^#tmpldir/tmpldir/' /etc/munin/munin.conf
-#
-# sed -i "s/^\[localhost.localdomain\]/[${HOSTNAME}]/" /etc/munin/munin.conf
-#
-# # ln -s /etc/munin/apache24.conf /etc/apache2/conf-enabled/munin.conf
-# sed -i 's/Require local/Require all granted\nOptions FollowSymLinks SymLinksIfOwnerMatch/g' /etc/munin/apache24.conf
-# htpasswd -c /etc/munin/munin-htpasswd admin
-# sed -i 's/Require all granted/AuthUserFile \/etc\/munin\/munin-htpasswd\nAuthName "Munin"\nAuthType Basic\nRequire valid-user/g' /etc/munin/apache24.conf
-#
-#
-# service apache2 restart
-# service munin-node restart
-# echo -e "\033[92;1mMunin installed\033[Om"
-#
-# echo -e "\033[35;1mInstalling Monit \033[0m"
-# sleep 3
-# # https://www.howtoforge.com/tutorial/server-monitoring-with-munin-and-monit-on-debian/2/
-# apt-get --yes install monit
-# # TODO setup monit rc
-# cat "$_assets"/monitrc > /etc/monit/monitrc
-#
-# # TODO setup webaccess
-# passok=0
-# while [ "$passok" = "0" ]
-# do
-#   echo -n "Write web access password to monit"
-#   read passwda
-#   echo -n "ReWrite web access password to monit"
-#   read passwdb
-#   if [ "$passwda" = "$passwdb" ]; then
-#     sed -i 's/PASSWD_TO_REPLACE/$passwda/g' /etc/monit/monitrc
-#     passok=1
-#   else
-#     echo "pass words don't match, please try again"
-#   fi
-# done
-#
-# # TODO setup mail settings
-# sed -i "s/server1\.example\.com/$HOSTNAME/g" /etc/monit/monitrc
-#
-# mkdir /var/www/html/monit
-# echo "hello" > /var/www/html/monit/token
-#
-# service monit start
-#
-# echo -e "\033[92;1mMonit installed\033[Om"
-
-
-# echo -e '\033[35m
-#     ___                __        __
-#    /   |_      _______/ /_____ _/ /_
-#   / /| | | /| / / ___/ __/ __ `/ __/
-#  / ___ | |/ |/ (__  ) /_/ /_/ / /_
-# /_/  |_|__/|__/____/\__/\__,_/\__/
-# \033[0m'
-# echo -e "\033[35;1mInstalling Awstat \033[0m"
-# sleep 3
-# apt-get --yes install awstats
-# # Configure AWStats
-# temp=`grep -i sitedomain /etc/awstats/awstats.conf.local | wc -l`
-# if [ $temp -lt 1 ]; then
-#     echo SiteDomain="$_domain" >> /etc/awstats/awstats.conf.local
-# fi
-# # Disable Awstats from executing every 10 minutes. Put a hash in front of any line.
-# sed -i 's/^[^#]/#&/' /etc/cron.d/awstats
-# echo -e "\033[92;1mAwstat installed\033[Om"
diff --git a/bin/vhost.sh b/bin/vhost.sh
index cb71a2d..441f11d 100755
--- a/bin/vhost.sh
+++ b/bin/vhost.sh
@@ -56,13 +56,14 @@ if [ "$vh" = "y" ]; then
     read _letsencrypt
   done
 
-  systemctl stop nginx
 
   # lets'encrypt
   # https://certbot.eff.org/lets-encrypt/debianstretch-nginx
   if [ "$_letsencrypt" = "yes" ]; then
     apt-get --yes install certbot
+    systemctl stop nginx
     certbot certonly --standalone -d "$_domain" --cert-name "$_domain"
+    systemctl start nginx
     # TODO stop the whole process if letsencrypt faile
     mkdir -p /etc/nginx/ssl/certs/"$_domain"
     openssl dhparam -out /etc/nginx/ssl/certs/"$_domain"/dhparam.pem 2048
@@ -146,7 +147,7 @@ if [ "$vh" = "y" ]; then
   ln -s /etc/nginx/sites-available/"$_domain".conf /etc/nginx/sites-enabled/"$_domain".conf
 
   # restart nginx
-  systemctl start nginx
+  systemctl restart nginx
   echo -e "\033[92;1mvhost $_domain configured \033[Om"
 else
   echo "Vhost installation aborted"