This commit is contained in:
2022-09-13 21:34:01 -05:00
parent d30eaddc07
commit 28adf73121

View File

@@ -521,7 +521,7 @@ NEWCERT(){
echo -e "${NEW_CERT}\n${daterun}" > ${FOLDER}/cert-request.lastrun echo -e "${NEW_CERT}\n${daterun}" > ${FOLDER}/cert-request.lastrun
yes | cp -rfH ${FOLDER}/cert-request.lastrun /etc/letsencrypt/cert-request.lastrun yes | cp -rfH ${FOLDER}/cert-request.lastrun /etc/letsencrypt/cert-request.lastrun
DIVIDER true DIVIDER true
SERVICE nginx reload web SERVICE nginx reload
fi fi
echo echo
echo -e "${idsCL[Green]}Certificate has been successfully created for '${idsCL[Yellow]}${NEW_CERT}${idsCL[Green]}'...${idsCL[Default]}" echo -e "${idsCL[Green]}Certificate has been successfully created for '${idsCL[Yellow]}${NEW_CERT}${idsCL[Green]}'...${idsCL[Default]}"
@@ -1017,41 +1017,41 @@ NEWSITE(){
echo "" echo ""
if [ "${SITE_TYPE}" = "local" ]; then if [ "${SITE_TYPE}" = "local" ]; then
echo -e "server { echo -e "server {
listen 80;" > /etc/nginx/sites-available/${MAIN_SITE} listen 80;" > /etc/nginx/sites-available/${MAIN_SITE}
if [ "${CREATE_SSL}" = "yes" ]; then if [ "${CREATE_SSL}" = "yes" ]; then
echo -e " listen 443 ssl http2;" >> /etc/nginx/sites-available/${MAIN_SITE} echo -e " listen 443 ssl http2;" >> /etc/nginx/sites-available/${MAIN_SITE}
fi fi
echo -e " echo -e "
server_name ${NGINX_SERVERNAME}; server_name ${NGINX_SERVERNAME};
set \$base /var/www/${MAIN_SITE}; set \$base /var/www/${MAIN_SITE};
root \$base/public_html; root \$base/public_html;
access_log /var/log/nginx/${MAIN_SITE}-access.log; access_log /var/log/nginx/${MAIN_SITE}-access.log;
error_log /var/log/nginx/${MAIN_SITE}-error.log warn;" >> /etc/nginx/sites-available/${MAIN_SITE} error_log /var/log/nginx/${MAIN_SITE}-error.log warn;" >> /etc/nginx/sites-available/${MAIN_SITE}
if [ "${CREATE_SSL}" = "yes" ]; then if [ "${CREATE_SSL}" = "yes" ]; then
echo -e " echo -e "
ssl_certificate /etc/letsencrypt/live/${MAIN_SITE}/fullchain.pem; ssl_certificate /etc/letsencrypt/live/${MAIN_SITE}/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/${MAIN_SITE}/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/${MAIN_SITE}/privkey.pem;
include conf.d/include/ssl-ciphers.conf;" >> /etc/nginx/sites-available/${MAIN_SITE} include conf.d/include/ssl-ciphers.conf;" >> /etc/nginx/sites-available/${MAIN_SITE}
fi fi
echo -e " echo -e "
index index.php; index index.php;
location / { location / {
try_files \$uri \$uri/ /index.php?\$query_string;" >> /etc/nginx/sites-available/${MAIN_SITE} try_files \$uri \$uri/ /index.php?\$query_string;" >> /etc/nginx/sites-available/${MAIN_SITE}
if [ "${CREATE_SSL}" = "yes" ]; then if [ "${CREATE_SSL}" = "yes" ]; then
echo -e " include conf.d/include/force-ssl.conf;" >> /etc/nginx/sites-available/${MAIN_SITE} echo -e " include conf.d/include/force-ssl.conf;" >> /etc/nginx/sites-available/${MAIN_SITE}
fi fi
echo -e " } echo -e " }
location ~ \.php\$ { location ~ \.php\$ {
fastcgi_pass unix:/var/run/php/php7.2-fpm.sock; fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
include conf.d/include/php_fastcgi.conf; include conf.d/include/php_fastcgi.conf;
} }
include conf.d/include/general.conf;" >> /etc/nginx/sites-available/${MAIN_SITE} include conf.d/include/general.conf;" >> /etc/nginx/sites-available/${MAIN_SITE}
if [ "${CREATE_SSL}" = "yes" ]; then if [ "${CREATE_SSL}" = "yes" ]; then
echo -e " include conf.d/include/letsencrypt-acme-challenge.conf;" >> /etc/nginx/sites-available/${MAIN_SITE} echo -e " include conf.d/include/letsencrypt-acme-challenge.conf;" >> /etc/nginx/sites-available/${MAIN_SITE}
fi fi
@@ -1059,56 +1059,57 @@ NEWSITE(){
sudo -u www-data mkdir -p /var/www/${MAIN_SITE}/{public_html,nginx_logs} sudo -u www-data mkdir -p /var/www/${MAIN_SITE}/{public_html,nginx_logs}
echo -en "${idsCL[LightYellow]}Waiting for folder replication across the webserver nodes... ${idsCL[Default]}" # echo -en "${idsCL[LightYellow]}Waiting for folder replication across the webserver nodes... ${idsCL[Default]}"
for nip in "${WEB_HOSTS[@]}"; do # for nip in "${WEB_HOSTS[@]}"; do
checkhost=$(CHECK_HOST ${nip}) # checkhost=$(CHECK_HOST ${nip})
if [ "${checkhost}" != "false" ]; then # if [ "${checkhost}" != "false" ]; then
if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *"${nip}"* ]]; then # if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *"${nip}"* ]]; then
checked=false # checked=false
until [ "${checked}" = "" ]; do # until [ "${checked}" = "" ]; do
checked=`ssh root@${nip} "[ ! -d /var/www/${MAIN_SITE} ] && echo does not exist"` # checked=`ssh root@${nip} "[ ! -d /var/www/${MAIN_SITE} ] && echo does not exist"`
done # done
fi # fi
fi # fi
done # done
echo -e "${idsCL[Green]}Completed${idsCL[Default]}" # echo -e "${idsCL[Green]}Completed${idsCL[Default]}"
#
echo -en "${idsCL[LightYellow]}Setting folder permissions... ${idsCL[Default]}" # echo -en "${idsCL[LightYellow]}Setting folder permissions... ${idsCL[Default]}"
#SET-PERMISSIONS ${MAIN_SITE} # SET-PERMISSIONS ${MAIN_SITE}
echo -e "${idsCL[Green]}Completed${idsCL[Default]}" # echo -e "${idsCL[Green]}Completed${idsCL[Default]}"
else else
echo -e "server { echo -e "server {
set \$forward_scheme ${PROXYSCHEME}; set \$forward_scheme ${PROXYSCHEME};
set \$server \"${PROXYHOST}\"; set \$server \"${PROXYHOST}\";
set \$port ${PROXYPORT}; set \$port ${PROXYPORT};
listen 80;" > /etc/nginx/sites-available/${MAIN_SITE} listen 80;" > /etc/nginx/sites-available/${MAIN_SITE}
if [ "${CREATE_SSL}" = "yes" ]; then if [ "${CREATE_SSL}" = "yes" ]; then
echo -e " listen 443 ssl http2;" >> /etc/nginx/sites-available/${MAIN_SITE} echo -e " listen 443 ssl http2;" >> /etc/nginx/sites-available/${MAIN_SITE}
fi fi
echo -e " echo -e "
server_name ${NGINX_SERVERNAME};" >> /etc/nginx/sites-available/${MAIN_SITE} server_name ${NGINX_SERVERNAME};" >> /etc/nginx/sites-available/${MAIN_SITE}
if [ "${CREATE_SSL}" = "yes" ]; then if [ "${CREATE_SSL}" = "yes" ]; then
echo -e " echo -e "
include conf.d/include/letsencrypt-acme-challenge.conf; include conf.d/include/letsencrypt-acme-challenge.conf;
include conf.d/include/ssl-ciphers.conf; include conf.d/include/ssl-ciphers.conf;
ssl_certificate /etc/letsencrypt/live/${MAIN_SITE}/fullchain.pem; ssl_certificate /etc/letsencrypt/live/${MAIN_SITE}/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/${MAIN_SITE}/privkey.pem;" >> /etc/nginx/sites-available/${MAIN_SITE} ssl_certificate_key /etc/letsencrypt/live/${MAIN_SITE}/privkey.pem;" >> /etc/nginx/sites-available/${MAIN_SITE}
fi fi
echo -e " echo -e "
access_log /var/log/nginx/proxy-${MAIN_SITE}.log proxy; access_log /var/log/nginx/proxy-${MAIN_SITE}.log proxy;
location / {" >> /etc/nginx/sites-available/${MAIN_SITE} location / {" >> /etc/nginx/sites-available/${MAIN_SITE}
if [ "${CREATE_SSL}" = "yes" ]; then if [ "${CREATE_SSL}" = "yes" ]; then
echo -e " include conf.d/include/force-ssl.conf;" >> /etc/nginx/sites-available/${MAIN_SITE} echo -e " include conf.d/include/force-ssl.conf;" >> /etc/nginx/sites-available/${MAIN_SITE}
fi fi
echo -e " include conf.d/include/proxy.conf; echo -e " include conf.d/include/proxy.conf;
}
} }
" >> /etc/nginx/sites-available/${MAIN_SITE} }
" >> /etc/nginx/sites-available/${MAIN_SITE}
fi fi
ln -s /etc/nginx/sites-available/${MAIN_SITE} /etc/nginx/sites-enabled/${MAIN_SITE} ln -s /etc/nginx/sites-available/${MAIN_SITE} /etc/nginx/sites-enabled/${MAIN_SITE}
if [ "${CREATE_SSL}" = "yes" ]; then if [ "${CREATE_SSL}" = "yes" ]; then
NEWCERT ${NEW_SITE} NEWCERT ${NEW_SITE}
@@ -1117,12 +1118,11 @@ NEWSITE(){
rm -f ${FOLDER}/new-site.lastrun rm -f ${FOLDER}/new-site.lastrun
daterun=`date +%Y-%m-%d-%H-%M-%S` daterun=`date +%Y-%m-%d-%H-%M-%S`
echo -e "${NEW_SITE}\n${daterun}" > ${FOLDER}/new-site.lastrun echo -e "${NEW_SITE}\n${daterun}" > ${FOLDER}/new-site.lastrun
yes | cp -rfH ${FOLDER}/new-site.lastrun /etc/nginx/new-site.lastrun # yes | cp -rfH ${FOLDER}/new-site.lastrun /etc/nginx/new-site.lastrun
yes | cp -rfH ${FOLDER}/new-site.lastrun /var/www/new-site.lastrun # yes | cp -rfH ${FOLDER}/new-site.lastrun /var/www/new-site.lastrun
daterun=`date +%Y-%m-%d-%H-%M-%S` # daterun=`date +%Y-%m-%d-%H-%M-%S`
echo -e "${daterun}" >> /etc/nginx/new-site.lastrun # echo -e "${daterun}" >> /etc/nginx/new-site.lastrun
DIVIDER true DIVIDER true
SERVICE nginx reload
echo "" echo ""
echo -e "${idsCL[LightGreen]}The new site for '${idsCL[LightGreen]}${NEW_SITE}${idsCL[Default]}' has been created.${idsCL[Default]}" echo -e "${idsCL[LightGreen]}The new site for '${idsCL[LightGreen]}${NEW_SITE}${idsCL[Default]}' has been created.${idsCL[Default]}"
echo "" echo ""