From 5b71d78f46ea2bad972dafbaf84fa412a2511e17 Mon Sep 17 00:00:00 2001 From: den Date: Wed, 14 Aug 2019 10:19:09 +0000 Subject: [PATCH] Autodetect testing 3 --- admin.sh | 38 ++++++++++++++++++++++++-------------- available.txt | 2 ++ users.sh | 2 ++ users.txt | 0 4 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 available.txt create mode 100644 users.sh create mode 100644 users.txt diff --git a/admin.sh b/admin.sh index 1ff11c1..491ca34 100644 --- a/admin.sh +++ b/admin.sh @@ -1,14 +1,24 @@ -username=$(ls /home) - -cd /home/$username -domain=$(jq -r '.domain' tilde.json) -if [ "tilde.best" == "$domain" ]; then - exit -else - echo "server {" >> /etc/nginx/sites-enabled/$domain - echo " listen 80;" >> /etc/nginx/sites-enabled/$domain - echo " server_name $domain;" >> /etc/nginx/sites-enabled/$domain - echo " root /home/$username/$domain;" >> /etc/nginx/sites-enabled/$domain - echo "}" >> /etc/nginx/sites-enabled/$domain - certbot --nginx -d $domain --non-interactive --redirect --agree-tos -m root@$domain -fi +until myserver; do + files=$(find /home -name tilde.json -print) + echo "$files" >> available.txt + if [ -s available.txt ] + then + echo "File not empty" + tilde=$(sed '1q;d' available.txt) + domain=$(jq -r '.domain' $tilde) + if [ "tilde.best" == "$domain" ]; then + sed -i '1d' ./available.txt + exit 1 + else + echo "server {" >> /etc/nginx/sites-enabled/$domain + echo " listen 80;" >> /etc/nginx/sites-enabled/$domain + echo " server_name $domain;" >> /etc/nginx/sites-enabled/$domain + echo " root /home/$username/$domain;" >> /etc/nginx/sites-enabled/$domain + echo "}" >> /etc/nginx/sites-enabled/$domain + certbot --nginx -d $domain --non-interactive --redirect --agree-tos -m root@$domain + sed -i '1d' ./available.txt + fi + else + rm -rf available.txt + fi +done diff --git a/available.txt b/available.txt new file mode 100644 index 0000000..139597f --- /dev/null +++ b/available.txt @@ -0,0 +1,2 @@ + + diff --git a/users.sh b/users.sh new file mode 100644 index 0000000..5503175 --- /dev/null +++ b/users.sh @@ -0,0 +1,2 @@ +username=$(ls /home) +echo "$username" >> users.txt diff --git a/users.txt b/users.txt new file mode 100644 index 0000000..e69de29