public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Updates in install scripts

Browse source
This commit is contained in:
root 2018-12-25 14:43:05 +01:00
parent 8d9dcd65b2
commit c6f148eef4
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
setup/functions
View file

@ -5,6 +5,7 @@ case "$hostType" in
hostTypeLabel="CentOS 7" hostTypeLabel="CentOS 7"
redisService=redis redisService=redis
apacheConf="/etc/httpd/conf.d/mailtrain.conf" apacheConf="/etc/httpd/conf.d/mailtrain.conf"
apacheLogsPath="logs"
if hash firewall-cmd 2>/dev/null; then if hash firewall-cmd 2>/dev/null; then
firewallCmdExists=yes firewallCmdExists=yes
@ -15,6 +16,7 @@ case "$hostType" in
hostTypeLabel="Ubuntu 18.04 LTS" hostTypeLabel="Ubuntu 18.04 LTS"
redisService=redis-server redisService=redis-server
apacheConf="/etc/apache2/conf-available/mailtrain.conf" apacheConf="/etc/apache2/conf-available/mailtrain.conf"
apacheLogsPath="/var/log/apache2"
if hash ufw 2>/dev/null; then if hash ufw 2>/dev/null; then
firewallCmdExists=yes firewallCmdExists=yes
@ -271,7 +273,7 @@ function installHttpsProxy {
RewriteEngine On RewriteEngine On
RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,QSA,R=permanent] RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,QSA,R=permanent]
ErrorLog logs/${hostTrusted}_redirect_error.log ErrorLog ${apacheLogsPath}/${hostTrusted}_redirect_error.log
LogLevel warn LogLevel warn
</VirtualHost> </VirtualHost>
@ -283,7 +285,7 @@ function installHttpsProxy {
RewriteEngine On RewriteEngine On
RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,QSA,R=permanent] RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,QSA,R=permanent]
ErrorLog logs/${hostSandbox}_redirect_error.log ErrorLog ${apacheLogsPath}/${hostSandbox}_redirect_error.log
LogLevel warn LogLevel warn
</VirtualHost> </VirtualHost>
@ -295,14 +297,14 @@ function installHttpsProxy {
RewriteEngine On RewriteEngine On
RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,QSA,R=permanent] RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,QSA,R=permanent]
ErrorLog logs/${hostPublic}_redirect_error.log ErrorLog ${apacheLogsPath}/${hostPublic}_redirect_error.log
LogLevel warn LogLevel warn
</VirtualHost> </VirtualHost>
<VirtualHost *:${portTrusted}> <VirtualHost *:${portTrusted}>
ServerName ${hostTrusted}:${portTrusted} ServerName ${hostTrusted}:${portTrusted}
ErrorLog logs/${hostTrusted}_ssl_error.log ErrorLog ${apacheLogsPath}/${hostTrusted}_ssl_error.log
TransferLog logs/${hostTrusted}_ssl_access.log TransferLog logs/${hostTrusted}_ssl_access.log
LogLevel warn LogLevel warn
@ -319,7 +321,7 @@ function installHttpsProxy {
<VirtualHost *:${portSandbox}> <VirtualHost *:${portSandbox}>
ServerName ${hostSandbox}:${portSandbox} ServerName ${hostSandbox}:${portSandbox}
ErrorLog logs/${hostSandbox}_ssl_error.log ErrorLog ${apacheLogsPath}/${hostSandbox}_ssl_error.log
TransferLog logs/${hostSandbox}_ssl_access.log TransferLog logs/${hostSandbox}_ssl_access.log
LogLevel warn LogLevel warn
@ -336,7 +338,7 @@ function installHttpsProxy {
<VirtualHost *:${portPublic}> <VirtualHost *:${portPublic}>
ServerName ${hostPublic}:${portPublic} ServerName ${hostPublic}:${portPublic}
ErrorLog logs/${hostPublic}_ssl_error.log ErrorLog ${apacheLogsPath}/${hostPublic}_ssl_error.log
TransferLog logs/${hostPublic}_ssl_access.log TransferLog logs/${hostPublic}_ssl_access.log
LogLevel warn LogLevel warn