From 39da2f54d73a3c38392aa0a0a960706da183ec08 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Wed, 27 Jan 2021 11:41:28 +0100 Subject: [PATCH] Cleanup EL8 Output --- CMS/nextcloud/conf.sh | 2 +- CMS/none/conf.sh | 2 +- CMS/wordpress/conf.sh | 2 +- installer.sh | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMS/nextcloud/conf.sh b/CMS/nextcloud/conf.sh index 39bb16f..32f1619 100644 --- a/CMS/nextcloud/conf.sh +++ b/CMS/nextcloud/conf.sh @@ -42,7 +42,7 @@ chown "$sitename":"$sitename" -R /var/www/"$domain"/html if [ "$shortdist" = "el8" ]; then #Setting SeLiux perms for centos semanage fcontext -a -t httpd_sys_rw_content_t "/var/www/$domain/html(/.*)?" > $OUTPUT 2>&1 - restorecon -vr /var/www/ > $OUTPUT 2>&1 + restorecon -r /var/www/ > $OUTPUT 2>&1 fi diff --git a/CMS/none/conf.sh b/CMS/none/conf.sh index 650461a..dd23163 100644 --- a/CMS/none/conf.sh +++ b/CMS/none/conf.sh @@ -22,5 +22,5 @@ fi if [ "$shortdist" = "el8" ]; then #Setting SeLiux perms for centos semanage fcontext -a -t httpd_sys_rw_content_t "/var/www/$domain/html(/.*)?" > $OUTPUT 2>&1 - restorecon -vr /var/www/ > $OUTPUT 2>&1 + restorecon -r /var/www/ > $OUTPUT 2>&1 fi \ No newline at end of file diff --git a/CMS/wordpress/conf.sh b/CMS/wordpress/conf.sh index 7860d73..7e11d10 100644 --- a/CMS/wordpress/conf.sh +++ b/CMS/wordpress/conf.sh @@ -54,7 +54,7 @@ chown "$sitename":"$sitename" -R /var/www/"$domain"/html if [ "$shortdist" = "el8" ]; then #Setting SeLiux perms for centos semanage fcontext -a -t httpd_sys_rw_content_t "/var/www/$domain/html(/.*)?" > $OUTPUT 2>&1 - restorecon -vr /var/www/ > $OUTPUT 2>&1 + restorecon -r /var/www/ > $OUTPUT 2>&1 fi #Makeing wordpress Finalize script and setting login Notice diff --git a/installer.sh b/installer.sh index f33b7c8..43b9eeb 100644 --- a/installer.sh +++ b/installer.sh @@ -64,7 +64,6 @@ elif [ "$(grep -oP '(?<=^PLATFORM_ID=).+' /etc/os-release | tr -d '"')" = "platf PKGI="${PKGM} install --setopt=install_weak_deps=False --best -y" PKGLIST="dnf" shortdist=el8 - echo "The support for this os is being worked on" else echo "This os in not supported" exit