From 827e5aa20bf5f0459e05469d9dd006fc0f6ef434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristhian=20Mart=C3=ADnez=20Ochoa?= <cristhian@qrokes.com>
Date: Tue, 27 Mar 2018 09:58:09 -0700
Subject: [PATCH] domain list update command

New command: webinoly -domain-list-update
Update the public suffix list that is used to validate domains when creating sites.
---
 plugins/webinoly | 17 ++++++++++++++++-
 weby             |  6 ++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/plugins/webinoly b/plugins/webinoly
index f6a2864..5373be8 100644
--- a/plugins/webinoly
+++ b/plugins/webinoly
@@ -2,7 +2,7 @@
 
 # Webinoly Server Manager Plugin
 # Syntax: webinoly <option>
-# Options: -update, -server-update or -server-reset, -verify, -dbpass, -tools-port, -login-www-data, -nologin-www-data, -config-cache, -uninstall, -config-load, -info
+# Options: -update, -server-update or -server-reset, -verify, -dbpass, -tools-port, -login-www-data, -nologin-www-data, -config-cache, -uninstall, -config-load, -info, -domain-list-update
 
 opt="$1"
 arg="$2"
@@ -236,6 +236,21 @@ elif [ "$opt" == "-config-load" ]; then
 elif [ "$opt" == "-info" ]; then
 	system_info
 
+elif [ "$opt" == "-domain-list-update" ]; then
+	echo "${blu}- Downloading!${end}"
+	sudo wget --timeout=15 -qrO /tmp/temp-public_suffix_list.dat https://publicsuffix.org/list/public_suffix_list.dat
+	if [[ -s /tmp/temp-public_suffix_list.dat ]]; then
+		echo "${blu}- Processing file!${end}"
+		sudo sed -i '/^\/\// d' /tmp/temp-public_suffix_list.dat
+		sudo sed -i '/^$/d' /tmp/temp-public_suffix_list.dat
+		sudo sed -i 's/[!]\+//g' /tmp/temp-public_suffix_list.dat
+		sudo sed -i 's/^\*\.\+//g' /tmp/temp-public_suffix_list.dat
+		sudo mv /tmp/temp-public_suffix_list.dat /opt/webinoly/lib/public_suffix_list.dat
+		echo "${gre}Domain list has been successfully updated!${end}"
+	else
+		echo "${red}[ERROR] Domain list not updated!${end}"
+	fi
+	
 else
 	echo "${red}Please enter a valid option!${end}"
 fi
diff --git a/weby b/weby
index 4a8f6c2..155fe98 100644
--- a/weby
+++ b/weby
@@ -89,8 +89,10 @@ conf_write app-version $webyversion
 [[ $setup -gt 0 && $setup -lt 4 ]] && stack -nginx
 [[ $setup -gt 1 && $setup -lt 4 ]] && stack -php
 [[ $setup == 3 ]] && stack -mysql
-[[ $setup == 4 ]] && source /opt/webinoly/lib/webin; config_load
-
+if [[ $setup == 4 ]]; then
+	source /opt/webinoly/lib/webin
+	config_load
+fi
 
 # Remove Installation File
 sudo rm weby