diff --git a/CoreModules/apache/conf.sh b/CoreModules/apache/conf.sh index 299adcd..933c4a5 100644 --- a/CoreModules/apache/conf.sh +++ b/CoreModules/apache/conf.sh @@ -10,10 +10,11 @@ if [ "$shortdist" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] || [ "$osrel" = "deb a2enmod actions fcgid alias proxy_fcgi ssl headers http2 setenvif socache_shmcb > $OUTPUT 2>&1 mkdir -p "$apacheConfDir"/snippets/ elif [ "$shortdist" = "el8" ]; then - echo 'IncludeOptional conf-enabled/*.conf'/etc/httpd/conf/httpd.conf - echo 'IncludeOptional sites-enabled/*.conf'/etc/httpd/conf/httpd.conf + echo 'IncludeOptional conf-enabled/*.conf' >>/etc/httpd/conf/httpd.conf + echo 'IncludeOptional sites-enabled/*.conf' >>/etc/httpd/conf/httpd.conf sed -i -e '/User apache/c\User www-data' -e '/Group apache/c\Group www-data' /etc/httpd/conf/httpd.conf sed -i 's/^/#/g' /etc/httpd/conf.d/welcome.conf + curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/apache/config/apache2/conf-httpd-custom.conf -o "$apacheConfDir"/conf-enabled/zzz-Httpd-custom.conf #Creating directories mkdir -p /etc/httpd/{sites-available,sites-enabled,conf-enabled,conf-available,snippets} fi diff --git a/CoreModules/apache/config/apache2/conf-httpd-custom.conf b/CoreModules/apache/config/apache2/conf-httpd-custom.conf new file mode 100644 index 0000000..62f8019 --- /dev/null +++ b/CoreModules/apache/config/apache2/conf-httpd-custom.conf @@ -0,0 +1 @@ +Define APACHE_LOG_DIR /var/log/httpd \ No newline at end of file diff --git a/CoreModules/apache/dnf.pkg.list b/CoreModules/apache/dnf.pkg.list index 789a318..aada559 100644 --- a/CoreModules/apache/dnf.pkg.list +++ b/CoreModules/apache/dnf.pkg.list @@ -1 +1 @@ -httpd mod_fcgid \ No newline at end of file +httpd mod_fcgid mod_ssl \ No newline at end of file