Skip to content
/ webinoly Public

Commit c8b1cfa

Browse files
QROkesQROkes
committed
testing
Final testing before release.
1 parent c495b07 commit c8b1cfa

File tree

3 files changed

+31
-24
lines changed

3 files changed

+31
-24
lines changed

‎lib/bkp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -664,8 +664,8 @@ export_server() {
664664
[[ -f /opt/webinoly/templates/source/custom_header_http_webinoly.data ]] && local include="$include /opt/webinoly/templates/source/custom_header_http_webinoly.data"
665665
[[ -f /opt/webinoly/templates/source/custom_header_https_webinoly.data ]] && local include="$include /opt/webinoly/templates/source/custom_header_https_webinoly.data"
666666
[[ -f /opt/webinoly/templates/source/custom_header_html_webinoly.data ]] && local include="$include /opt/webinoly/templates/source/custom_header_html_webinoly.data"
667-
[[ -f $MYSQL_CONF_PATH/${MYSQL_CONF_PREF}-webinoly-login.cnf ]] && local include="$include $MYSQL_CONF_PATH/${MYSQL_CONF_PREF}-webinoly-login.cnf"
668-
[[ -f $MYSQL_CONF_PATH/${MYSQL_CONF_PREF}-webinoly.cnf ]] && local include="$include $MYSQL_CONF_PATH/${MYSQL_CONF_PREF}-webinoly.cnf"
667+
#[[ -f $MYSQL_CONF_PATH/${MYSQL_CONF_PREF}-webinoly-login.cnf ]] && local include="$include $MYSQL_CONF_PATH/${MYSQL_CONF_PREF}-webinoly-login.cnf"
668+
#[[ -f $MYSQL_CONF_PATH/${MYSQL_CONF_PREF}-webinoly.cnf ]] && local include="$include $MYSQL_CONF_PATH/${MYSQL_CONF_PREF}-webinoly.cnf"
669669
[[ -d /etc/nginx/certs ]] && local include="$include /etc/nginx/certs"
670670

671671
if [[ $(conf_read exclude-other-filesystems) == "true" ]]; then

‎lib/kernel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ linux_optim() {
4949
if [[ $ram -gt 28 ]]; then
5050
swappiness=1
5151
min_free_kbytes=$(($ramb*20)) # ~2% of RAM in MB (value in kB expected by kernel)
52-
dirty_ratio=5
52+
dirty_ratio=5 # Good for modern HVMe disks, it can cause overhead issues with old HDD...
5353
dirty_bg_ratio=2
5454
vfs_cache_pressure=100
5555
elif [[ $ram -gt 2 ]]; then
@@ -72,9 +72,9 @@ linux_optim() {
7272
vfs_cache_pressure=200
7373
fi
7474

75-
# Shared memory (generic correction; not DB2 IPC). shmmax ~80% RAM; shmall = shmmax/pagesize
75+
# Shared memory (generic correction; not DB2 IPC). shmmax ~70% RAM; shmall = shmmax/pagesize
7676
pagesize=$(getconf PAGE_SIZE)
77-
[[ $ram -gt 1 ]] && shmmax=$(($ram*1024*1024*1024*80/100)) || shmmax=268435456
77+
[[ $ram -gt 1 ]] && shmmax=$(($ram*1024*1024*1024*70/100)) || shmmax=268435456
7878
shmall=$(($shmmax/$pagesize))
7979

8080
# SysV IPC — scale safely by RAM and cap at 32768 (kept for broad compatibility)

‎lib/sites‎

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -882,10 +882,11 @@ force_redirect() {
882882
if ! [[ $force_redirect =~ ^(www|root|off)$ ]]; then
883883
echo "${red}[ERROR] Please, enter a valid argument!${end}"
884884
exit 1
885-
fi
886-
if [[ $subdomain == "true" ]]; then
885+
elif [[ $subdomain == "true" ]]; then
887886
echo "${red}[ERROR] Please, use the main/root domain, Force-Redirection should not be used in Subdomains!${end}"
888887
exit 1
888+
elif $(is_forward $domain) == "true" ]]; then
889+
echo "${dim}[INFO] You've unlocked nonsense mode. Proceeding anyway... ${end}"
889890
fi
890891

891892
local rediron=$( grep -F "WebinolyWWWredirectStart" /etc/nginx/sites-available/$domain )
@@ -904,7 +905,7 @@ force_redirect() {
904905
sudo sed -i "/server_name /c \ server_name www.$domain;" /etc/nginx/sites-available/$domain
905906

906907
# Admin Tools!
907-
sudo sed -i "/server_name /c \ server_name www.$domain;" /etc/nginx/sites-available/$ADMIN_TOOLS_SITE
908+
[[ $domain == $(conf_read tools-site) ]] && sudo sed -i "/server_name /c \ server_name www.$domain;" /etc/nginx/sites-available/$ADMIN_TOOLS_SITE
908909

909910
echo "${gre}Force-Redirection${blu} (${domain} -> www.${domain}) ${gre}has been successfully enabled!${end}"
910911
;;
@@ -918,7 +919,7 @@ force_redirect() {
918919
sudo sed -i "/server_name /c \ server_name $domain;" /etc/nginx/sites-available/$domain
919920

920921
# Admin Tools!
921-
sudo sed -i "/server_name /c \ server_name $domain;" /etc/nginx/sites-available/$ADMIN_TOOLS_SITE
922+
[[ $domain == $(conf_read tools-site) ]] && sudo sed -i "/server_name /c \ server_name $domain;" /etc/nginx/sites-available/$ADMIN_TOOLS_SITE
922923

923924
echo "${gre}Force-Redirection${blu} (www.${domain} -> ${domain}) ${gre}has been successfully enabled!${end}"
924925
;;
@@ -931,8 +932,10 @@ force_redirect() {
931932
sudo sed -i "/server_name /c \ $sername" /etc/nginx/sites-available/$domain
932933

933934
# Admin Tools!
934-
sudo sed -i '/WebinolyWWWredirectStart/,/WebinolyWWWredirectEnd/{/.*/d}' /etc/nginx/sites-available/$ADMIN_TOOLS_SITE
935-
sudo sed -i "/server_name /c \ $sername" /etc/nginx/sites-available/$ADMIN_TOOLS_SITE
935+
if [[ $domain == $(conf_read tools-site) ]]; then
936+
sudo sed -i '/WebinolyWWWredirectStart/,/WebinolyWWWredirectEnd/{/.*/d}' /etc/nginx/sites-available/$ADMIN_TOOLS_SITE
937+
sudo sed -i "/server_name /c \ $sername" /etc/nginx/sites-available/$ADMIN_TOOLS_SITE
938+
fi
936939

937940
echo "${gre}Force-Redirection has been successfully disabled!${end}"
938941
else
@@ -946,12 +949,14 @@ force_redirect() {
946949
sudo sed -i '1r /tmp/template-site-wwwredirect' /etc/nginx/sites-available/$domain
947950

948951
# Admin Tools!
949-
sudo sed -i "/listen 80/c \ listen $(conf_read tools-port);" /tmp/template-site-wwwredirect
950-
sudo sed -i "/listen \[::\]:80/c \ listen [::]:$(conf_read tools-port);" /tmp/template-site-wwwredirect
951-
[[ $force_redirect == "www" ]] && sudo sed -i "/return 301 /c \ return 301 http://www.${domain}:$(conf_read tools-port)\$request_uri;" /tmp/template-site-wwwredirect
952-
[[ $force_redirect == "root" ]] && sudo sed -i "/return 301 /c \ return 301 http://${domain}:$(conf_read tools-port)\$request_uri;" /tmp/template-site-wwwredirect
953-
sudo sed -i '/WebinolyWWWredirectStart/,/WebinolyWWWredirectEnd/{/.*/d}' /etc/nginx/sites-available/$ADMIN_TOOLS_SITE
954-
sudo sed -i '/Webinoly Admin-Tools NGINX CONFIGURATION/r /tmp/template-site-wwwredirect' /etc/nginx/sites-available/$ADMIN_TOOLS_SITE
952+
if [[ $domain == $(conf_read tools-site) ]]; then
953+
sudo sed -i "/listen 80/c \ listen $(conf_read tools-port);" /tmp/template-site-wwwredirect
954+
sudo sed -i "/listen \[::\]:80/c \ listen [::]:$(conf_read tools-port);" /tmp/template-site-wwwredirect
955+
[[ $force_redirect == "www" ]] && sudo sed -i "/return 301 /c \ return 301 http://www.${domain}:$(conf_read tools-port)\$request_uri;" /tmp/template-site-wwwredirect
956+
[[ $force_redirect == "root" ]] && sudo sed -i "/return 301 /c \ return 301 http://${domain}:$(conf_read tools-port)\$request_uri;" /tmp/template-site-wwwredirect
957+
sudo sed -i '/WebinolyWWWredirectStart/,/WebinolyWWWredirectEnd/{/.*/d}' /etc/nginx/sites-available/$ADMIN_TOOLS_SITE
958+
sudo sed -i '/Webinoly Admin-Tools NGINX CONFIGURATION/r /tmp/template-site-wwwredirect' /etc/nginx/sites-available/$ADMIN_TOOLS_SITE
959+
fi
955960

956961
elif [[ $(is_ssl $domain) == "true" && $force_redirect =~ ^(www|root)$ ]]; then
957962
sudo sed -i '/listen 80/c \ listen 443 ssl;' /tmp/template-site-wwwredirect
@@ -982,13 +987,15 @@ force_redirect() {
982987
sudo sed -i '/WebinolySSLredirectEnd/r /tmp/template-site-wwwredirect' /etc/nginx/sites-available/$domain
983988

984989
# Admin Tools!
985-
sudo sed -i "s/listen 443/listen $(conf_read tools-port)/g" /tmp/template-site-wwwredirect
986-
sudo sed -i "s/listen \[::\]:443/listen [::]:$(conf_read tools-port)/g" /tmp/template-site-wwwredirect
987-
[[ $force_redirect == "www" ]] && sudo sed -i "/return 301 /c \ return 301 https://www.${domain}:$(conf_read tools-port)\$request_uri;" /tmp/template-site-wwwredirect
988-
[[ $force_redirect == "root" ]] && sudo sed -i "/return 301 /c \ return 301 https://${domain}:$(conf_read tools-port)\$request_uri;" /tmp/template-site-wwwredirect
989-
sudo sed -i "/return 301 /i \ error_page 497 https:\/\/\$host:\$server_port\$request_uri;" /tmp/template-site-wwwredirect
990-
sudo sed -i '/WebinolyWWWredirectStart/,/WebinolyWWWredirectEnd/{/.*/d}' /etc/nginx/sites-available/$ADMIN_TOOLS_SITE
991-
sudo sed -i '/WebinolyToolsEndBlackhole/r /tmp/template-site-wwwredirect' /etc/nginx/sites-available/$ADMIN_TOOLS_SITE
990+
if [[ $domain == $(conf_read tools-site) ]]; then
991+
sudo sed -i "s/listen 443/listen $(conf_read tools-port)/g" /tmp/template-site-wwwredirect
992+
sudo sed -i "s/listen \[::\]:443/listen [::]:$(conf_read tools-port)/g" /tmp/template-site-wwwredirect
993+
[[ $force_redirect == "www" ]] && sudo sed -i "/return 301 /c \ return 301 https://www.${domain}:$(conf_read tools-port)\$request_uri;" /tmp/template-site-wwwredirect
994+
[[ $force_redirect == "root" ]] && sudo sed -i "/return 301 /c \ return 301 https://${domain}:$(conf_read tools-port)\$request_uri;" /tmp/template-site-wwwredirect
995+
sudo sed -i "/return 301 /i \ error_page 497 https:\/\/\$host:\$server_port\$request_uri;" /tmp/template-site-wwwredirect
996+
sudo sed -i '/WebinolyWWWredirectStart/,/WebinolyWWWredirectEnd/{/.*/d}' /etc/nginx/sites-available/$ADMIN_TOOLS_SITE
997+
sudo sed -i '/WebinolyToolsEndBlackhole/r /tmp/template-site-wwwredirect' /etc/nginx/sites-available/$ADMIN_TOOLS_SITE
998+
fi
992999
fi
9931000

9941001
sudo rm /tmp/template-site-wwwredirect

0 commit comments

Comments
 (0)