Skip to content

Commit

Permalink
some fixes
Browse files Browse the repository at this point in the history 
Fixes after testing.
  • Loading branch information
@QROkes
QROkes committed Aug 30, 2021
1 parent c36f52a commit 15380f2
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 12 deletions.
32 changes: 25 additions & 7 deletions lib/bkp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,7 @@ check_exported_conf() {
[[ -n $(conf_read_exported nginx-fd-ratio) ]] && conf_write nginx-fd-ratio $(conf_read_exported nginx-fd-ratio)
[[ -n $(conf_read_exported swap-mem) ]] && conf_write swap-mem $(conf_read_exported swap-mem)
[[ -n $(conf_read_exported nginx-ppa) ]] && conf_write nginx-ppa $(conf_read_exported nginx-ppa)
[[ -n $(conf_read_exported cache-size) ]] && conf_write nginx-ppa $(conf_read_exported cache-size)
[[ -n $(conf_read_exported timezone) ]] && conf_write timezone $(conf_read_exported timezone)

[[ -n $(conf_read_exported php-ver) ]] && conf_write php-ver $(conf_read_exported php-ver)
Expand All @@ -463,7 +464,7 @@ check_exported_conf() {
[[ -n $(conf_read_exported php-pm) ]] && conf_write php-pm $(conf_read_exported php-pm)
[[ -n $(conf_read_exported php-max-child) ]] && conf_write php-max-child $(conf_read_exported php-max-child)
[[ -n $(conf_read_exported php-max-time) ]] && conf_write php-max-time $(conf_read_exported php-max-time)

[[ -n $(conf_read_exported mysql-ver) ]] && conf_write mysql-ver $(conf_read_exported mysql-ver)

# Built stack based on exported conf
if [[ $(conf_read_exported nginx) == "true" && $(conf_read_exported nginx-tool) == "true" ]]; then
Expand Down Expand Up @@ -495,7 +496,6 @@ check_exported_conf() {
[[ $(conf_read_exported header-xssp) == "false" ]] && sudo webinoly -header-xssp=off
[[ $(conf_read_exported header-xcto) == "false" ]] && sudo webinoly -header-xcto=off
[[ $(conf_read_exported header-xfo) =~ ^(off|deny|sameorigin)$ ]] && sudo webinoly -header-xfo=$(conf_read_exported header-xfo)
[[ $(conf_read_exported header-custom) == "true" ]] && sudo webinoly -custom-headers=reload
[[ $(conf_read_exported header-xfo) == "allow-from" && -n $(conf_read_exported header-xfo-url) ]] && sudo webinoly -header-xfo=allow-from -url=$(conf_read_exported header-xfo-url)

if tar -tvf $file --absolute-names | grep -oq "/opt/webinoly/templates/source/csp_webinoly.data"; then
Expand All @@ -514,7 +514,19 @@ check_exported_conf() {
tar -C / -xf $file /opt/webinoly/templates/source/rob_webinoly.data --absolute-names
[[ -s /opt/webinoly/templates/source/rob_webinoly.data ]] && sudo webinoly -header-robots=on
fi


if [[ $(conf_read_exported header-custom) == "true" ]]; then
if tar -tvf $file --absolute-names | grep -oq "/opt/webinoly/templates/source/custom_header_http_webinoly.data"; then
tar -C / -xf $file /opt/webinoly/templates/source/custom_header_http_webinoly.data --absolute-names
fi
if tar -tvf $file --absolute-names | grep -oq "/opt/webinoly/templates/source/custom_header_https_webinoly.data"; then
tar -C / -xf $file /opt/webinoly/templates/source/custom_header_https_webinoly.data --absolute-names
fi
if tar -tvf $file --absolute-names | grep -oq "/opt/webinoly/templates/source/custom_header_html_webinoly.data"; then
tar -C / -xf $file /opt/webinoly/templates/source/custom_header_html_webinoly.data --absolute-names
fi
sudo webinoly -custom-headers=reload
fi

[[ -n $(conf_read_exported log-lines) ]] && conf_write log-lines $(conf_read_exported log-lines)
[[ -n $(conf_read_exported awsiamrole) ]] && conf_write awsiamrole $(conf_read_exported awsiamrole)
Expand Down Expand Up @@ -571,7 +583,14 @@ export_server() {
[[ -f /etc/nginx/.htpasswd ]] && local include="$include /etc/nginx/.htpasswd"
[[ -f $HOME/.aws/credentials ]] && local include="$include $HOME/.aws/credentials"
[[ -f /opt/webinoly/templates/source/csp_webinoly.data ]] && local include="$include /opt/webinoly/templates/source/csp_webinoly.data"
[[ -f /opt/webinoly/templates/source/pph_webinoly.data ]] && local include="$include /opt/webinoly/templates/source/pph_webinoly.data"
[[ -f /opt/webinoly/templates/source/cch_webinoly.data ]] && local include="$include /opt/webinoly/templates/source/cch_webinoly.data"
[[ -f /opt/webinoly/templates/source/rob_webinoly.data ]] && local include="$include /opt/webinoly/templates/source/rob_webinoly.data"
[[ -f /opt/webinoly/templates/source/custom_header_http_webinoly.data ]] && local include="$include /opt/webinoly/templates/source/custom_header_http_webinoly.data"
[[ -f /opt/webinoly/templates/source/custom_header_https_webinoly.data ]] && local include="$include /opt/webinoly/templates/source/custom_header_https_webinoly.data"
[[ -f /opt/webinoly/templates/source/custom_header_html_webinoly.data ]] && local include="$include /opt/webinoly/templates/source/custom_header_html_webinoly.data"
[[ -f /etc/mysql/mariadb.conf.d/90-webinoly.cnf ]] && local include="$include /etc/mysql/mariadb.conf.d/90-webinoly.cnf"
[[ -d /etc/nginx/certs ]] && local include="$include /etc/nginx/certs"

sudo tar $exclude -Pcf $destination/$filename $include

Expand Down Expand Up @@ -643,9 +662,8 @@ export_site() {
[[ -s /etc/nginx/sites-available/$siteto ]] && local include="$include /etc/nginx/sites-available/$siteto"
[[ -L /etc/nginx/sites-enabled/$siteto ]] && local include="$include /etc/nginx/sites-enabled/$siteto"
[[ -s /etc/nginx/apps.d/.htpasswd-$siteto ]] && local include="$include /etc/nginx/apps.d/.htpasswd-$siteto"
[[ -d /etc/nginx/certs ]] && local include="$include /etc/nginx/certs"
[[ -d /var/www/$siteto && -z $subfolder ]] && local include="$include /var/www/$siteto"
[[ -d /var/www/$siteto/htdocs$subfolder && -n $subfolder ]] && local include="$include /var/www/$siteto/htdocs$subfolder"
[[ -z $subfolder && -d /var/www/$siteto ]] && local include="$include /var/www/$siteto"
[[ -n $subfolder && -d /var/www/$siteto/htdocs$subfolder ]] && local include="$include /var/www/$siteto/htdocs$subfolder"

for app in /etc/nginx/apps.d/${siteto}${subn}*.conf
do
Expand All @@ -656,7 +674,7 @@ export_site() {
if [[ -f /etc/nginx/conf.d/webinoly.conf ]]; then
if [[ -f /etc/nginx/apps.d/$siteto$subn-wpcache.conf || -f /etc/nginx/apps.d/$siteto$subn-phpcache.conf ]]; then
local custom_cache="$(grep -E "^fastcgi_cache_path \/run\/nginx-cache\/${siteto}[ _].*;$" /etc/nginx/conf.d/webinoly.conf)"
elif [[ -n $(grep -F "# WebinolyProxyCacheStart" /etc/nginx/apps.d/$siteto$subn-proxy.conf) ]]; then
elif [[ -f /etc/nginx/apps.d/$siteto$subn-proxy.conf && -n $(grep -F "# WebinolyProxyCacheStart" /etc/nginx/apps.d/$siteto$subn-proxy.conf) ]]; then
local custom_cache="$(grep -E "^proxy_cache_path \/run\/nginx-cache\/${siteto}[ _].*;$" /etc/nginx/conf.d/webinoly.conf)"
fi
if [[ -n $custom_cache ]]; then
Expand Down
2 changes: 1 addition & 1 deletion lib/verify
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ if [[ ! -d /etc/mysql && $(conf_read mysql) == "true" ]]; then
echo "- [ERROR] Folder: /etc/mysql not found!"
ver_four_err="1"
elif [[ -d /etc/mysql && $(conf_read mysql) != "true" ]]; then
echo "${dim}- [WARNING] Seems like MySQL is installed but Webinoly can not detect it!${end}${red}"
echo "${dim}- [WARNING] Seems like some MySQL data remains but MySQL is not installed or Webinoly can not detect it!${end}${red}"
ver_four_war="1"
fi

Expand Down
13 changes: 9 additions & 4 deletions lib/webin
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1708,11 +1708,13 @@ http_header_custom() {
exit 1
fi

sudo sed -i '/WebinolyCustomHeaders/,/WebinolyCustomHeadersEnd/{/.*/d}' /etc/nginx/common/headers-http.conf
sudo sed -i '/WebinolyCustomHeaders/,/WebinolyCustomHeadersEnd/{/.*/d}' /etc/nginx/common/headers-https.conf
sudo sed -i '/WebinolyCustomHeaders/,/WebinolyCustomHeadersEnd/{/.*/d}' /etc/nginx/common/headers-html.conf
if [[ $(conf_read nginx) == "true" ]]; then
sudo sed -i '/WebinolyCustomHeaders/,/WebinolyCustomHeadersEnd/{/.*/d}' /etc/nginx/common/headers-http.conf
sudo sed -i '/WebinolyCustomHeaders/,/WebinolyCustomHeadersEnd/{/.*/d}' /etc/nginx/common/headers-https.conf
sudo sed -i '/WebinolyCustomHeaders/,/WebinolyCustomHeadersEnd/{/.*/d}' /etc/nginx/common/headers-html.conf
fi

if [[ $custom_headers == "reload" ]]; then
if [[ $custom_headers == "reload" && $(conf_read nginx) == "true" ]]; then
if [[ -s /opt/webinoly/templates/source/custom_header_http_webinoly.data ]]; then
local http="$(sudo grep -E "^add_header .*;$" /opt/webinoly/templates/source/custom_header_http_webinoly.data)"
if [[ -n $http ]]; then
Expand Down Expand Up @@ -1742,6 +1744,9 @@ $html

conf_write header-custom true
echo "${gre}Custom Headers successfully configured!${end}"
elif [[ $custom_headers == "reload" ]]; then
conf_write header-custom true
echo "${gre}Custom Headers successfully configured and it will be used next time NGINX is installed!${end}"
else
conf_delete header-custom
echo "${gre}Custom Headers successfully removed!${end}"
Expand Down

0 comments on commit 15380f2

Please sign in to comment.