beenull/webinoly
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

parked sites improved

Browse source 
- ssl nginx-error fixed.
- ssl check root before creation.
- parked and proxy sites are now listed in -delete-all.
This commit is contained in:
Cristhian Martínez Ochoa 2018-04-24 20:14:43 -06:00
parent e22f9fd8b4
commit b26520b33f
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/site-ssl
View file

@ -18,6 +18,12 @@ site_ssl_on() {
exit 1
fi
if [[ ! -d /var/www/$root/htdocs ]]; then
echo "${red}Seems like you are trying to request an SSL Certificate for a Parked/Mapped Domain.!${end}"
echo "${red}Please, use the '-root=domain.com' parameter to include the main domain path.${end}"
exit 1
fi
# Check if Letsencrypt is installed
if [[ $(conf_read nginx-tool) != "true" || ! -a /usr/bin/letsencrypt ]]; then
echo "${red}[ERROR] Seems like Let's Encrypt tool is not installed!${end}"

24
plugins/site
View file

@ -141,14 +141,22 @@ elif [[ "$domain" == "-delete-all" && -z "$type" && -z "$cache" ]]; then
domi=$(echo $site | cut -f 4 -d "/")
# List sites then will be deleted
if [[ $domi != "html" && $domi != $(conf_read tools-port) ]]; then
sudo rm -rf /etc/nginx/sites-available/$domi
echo "${gre}Your site ${blu}${domi}${gre} has been successfully deleted! ${end}"
fi
# Determina if site is WP (so has DB to delete)
if [[ -a $site/wp-config.php || -a $site/htdocs/wp-config.php ]]; then
db_delete $domi
fi
[[ -a $site/wp-config.php || -a $site/htdocs/wp-config.php ]] && db_delete $domi
done
# List all remaining sites (parked and proxy)
for site in "/etc/nginx/sites-available"/*
do
domi=$(echo $site | cut -f 5 -d "/")
[[ $domi != "html" && $domi != "default" && $domi != $(conf_read tools-port) ]]; then
echo "${gre}Your site ${blu}${domi}${gre} has been successfully deleted! ${end}"
fi
done
# Delete all files
# -rf is necessary to not generate an error when is empty.
sudo rm -rf /etc/nginx/sites-available/!(default|$(conf_read tools-port))
@ -217,23 +225,23 @@ elif [ "$type" == "-parked" ]; then
read -p "Main site domain: " mapto
mapto=${mapto:-NeverMatchAtFirstDotCom}
echo "${end}"
if [[ ! -a /etc/nginx/sites-available/$mapto ]]; then
echo "${red} Main site domain not found! ${end}"
fi
[[ ! -a /etc/nginx/sites-available/$mapto ]] && echo "${red} Main site domain not found! ${end}"
done
sudo cp /etc/nginx/sites-available/$mapto /etc/nginx/sites-available/$domain
sudo chmod 644 /etc/nginx/sites-available/$domain
sudo chown root:root /etc/nginx/sites-available/$domain
sudo ln -s /etc/nginx/sites-available/$domain /etc/nginx/sites-enabled/$domain
# Nginx conf file for the new parked domain
sudo sed -i "s/$mapto/$domain/g" /etc/nginx/sites-available/$domain
sudo sed -i "/root/c \ root /var/www/$mapto/htdocs;" /etc/nginx/sites-available/$domain
cusconl=$( grep -F "include /var/www/$domain/conf/nginx" /etc/nginx/sites-available/$domain | sed "s/$domain/$mapto/" )
sed -i "/include \/var\/www\/$domain\/conf\/nginx/c \ ${cusconl}" /etc/nginx/sites-available/$domain
# Prevent if SSL is enabled in main site and ssl data is copied to parked site causing an error.
sudo site $domain -ssl-off=force > /dev/null 2>&1 &
echo "${gre}"
echo " Parked domain was successfully configured! "
echo "Parked domain was successfully configured! "
echo "${end}"
# Reverse proxy