Merge branch 'patch-4' into 'master'

Update letsencrypt_renew_hook.sh as dovecot-imapd is just dovecot in Red Hat /...

See merge request ispconfig/ispconfig3!1004

Author: Till Brehm

install/lib/installer_base.lib.php

@@ -2083,12 +2083,12 @@ public function make_ispconfig_ssl_cert() {
 
 			// This script is needed earlier to check and open http port 80 or standalone might fail
 			// Make executable and temporary symlink latest letsencrypt pre, post and renew hook script before install
-			if (file_exists('/tmp/ispconfig3_install/server/scripts/letsencrypt_pre_hook.sh'))
-				symlink('/tmp/ispconfig3_install/server/scripts/letsencrypt_pre_hook.sh', '/usr/local/bin/letsencrypt_pre_hook.sh');
-			if (file_exists('/tmp/ispconfig3_install/server/scripts/letsencrypt_post_hook.sh'))
-				symlink('/tmp/ispconfig3_install/server/scripts/letsencrypt_post_hook.sh', '/usr/local/bin/letsencrypt_post_hook.sh');
-			if (file_exists('/tmp/ispconfig3_install/server/scripts/letsencrypt_renew_hook.sh'))
-				symlink('/tmp/ispconfig3_install/server/scripts/letsencrypt_renew_hook.sh', '/usr/local/bin/letsencrypt_renew_hook.sh');
+			if (file_exists(dirname(getcwd()) . '/server/scripts/letsencrypt_pre_hook.sh'))
+				symlink(dirname(getcwd()) . '/server/scripts/letsencrypt_pre_hook.sh', '/usr/local/bin/letsencrypt_pre_hook.sh');
+			if (file_exists(dirname(getcwd()) . '/server/scripts/letsencrypt_post_hook.sh'))
+				symlink(dirname(getcwd()) . '/server/scripts/letsencrypt_post_hook.sh', '/usr/local/bin/letsencrypt_post_hook.sh');
+			if (file_exists(dirname(getcwd()) . '/server/scripts/letsencrypt_renew_hook.sh'))
+				symlink(dirname(getcwd()) . '/server/scripts/letsencrypt_renew_hook.sh', '/usr/local/bin/letsencrypt_renew_hook.sh');
 			chown('/usr/local/bin/letsencrypt_pre_hook.sh', 'root');
 			chown('/usr/local/bin/letsencrypt_post_hook.sh', 'root');
 			chown('/usr/local/bin/letsencrypt_renew_hook.sh', 'root');

install/uninstall.php

@@ -88,6 +88,9 @@
 	exec('rm -rf /usr/local/ispconfig');
 
 	// Delete various other files
+	@unlink("/usr/local/bin/letsencrypt_post_hook.sh");
+	@unlink("/usr/local/bin/letsencrypt_pre_hook.sh");
+	@unlink("/usr/local/bin/letsencrypt_renew_hook.sh");
 	@unlink("/usr/local/bin/ispconfig_update.sh");
 	@unlink("/usr/local/bin/ispconfig_update_from_svn.sh");
 	@unlink("/var/spool/mail/ispconfig");

server/scripts/letsencrypt_renew_hook.sh

@@ -17,14 +17,15 @@ lelive=/etc/letsencrypt/live/$(hostname -f); if [ -d "$lelive" ]; then
     pureftpdpem=/etc/ssl/private/pure-ftpd.pem; if [ -e "$pureftpdpem" ]; then chmod 600 $pureftpdpem; fi
     # For Red Hat, Centos or derivatives
     if which yum &> /dev/null 2>&1 ; then
-        if [ rpm -q pure-ftpd-mysql ]; then service pure-ftpd-mysql restart; fi
+        if [ rpm -q pure-ftpd ]; then service pure-ftpd restart; fi
         if [ rpm -q monit ]; then service monit restart; fi
         if [ rpm -q postfix ]; then service postfix restart; fi
-        if [ rpm -q dovecot-imapd ]; then service dovecot restart; fi
-        if [ rpm -q mysql ]; then service mysql restart; fi
-        if [ rpm -q mariadb ]; then service mysql restart; fi
+        if [ rpm -q dovecot ]; then service dovecot restart; fi
+        if [ rpm -q mysql-server ]; then service mysqld restart; fi
+        if [ rpm -q mariadb-server ]; then service mariadb restart; fi
+        if [ rpm -q MariaDB-server ]; then service mysql restart; fi
         if [ rpm -q nginx ]; then service nginx restart; fi
-        if [ rpm -q apache2 ]; then service apache2 restart; fi
+        if [ rpm -q httpd ]; then service httpd restart; fi
     # For Debian, Ubuntu or derivatives
     elif apt-get -v >/dev/null 2>&1 ; then
         if [ $(dpkg-query -W -f='${Status}' pure-ftpd-mysql 2>/dev/null | grep -c "ok installed") -eq 1 ]; then service pure-ftpd-mysql restart; fi