From dd01f7e5fa4905ffdd4b5b53b552b5ce41385cd2 Mon Sep 17 00:00:00 2001 From: Tyler Date: Fri, 22 Nov 2024 20:06:33 -0800 Subject: [PATCH] Final install.sh touches --- install.sh | 15 +++++++++++---- kjv-api-test.sh | 4 ++-- kjv-api.sh | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/install.sh b/install.sh index 36d49d6..ec7dea6 100755 --- a/install.sh +++ b/install.sh @@ -31,7 +31,7 @@ systemctl enable kjv-api.service systemctl start kjv-api.service echo "Waiting for the service to initialize" -sleep 5 +sleep 3 echo "If you see a random Bible verse below in json format, your installation was successful:" echo @@ -40,10 +40,17 @@ curl -XGET 127.0.0.1:1611/random echo echo -echo "You must now set your webserver as a reverse proxy for your domain and point it to 127.0.0.1:1611" +YEL='\033[0;33m' +NC='\033[0m' # No Color + +echo -e "${YEL}You must now set your webserver as a reverse proxy for your domain and point it to 127.0.0.1:1611 ${NC}" echo "See the install folder for example configuration files." echo echo "Notes:" echo " - Thank you for running this software to bring the Bible to people." -echo " - You can change the pages (it's not fancy) in html/. There's no fancy libraries." -echo +echo " - You can change the pages (it's not fancy) in /opt/kjv-api/html/. There's no fancy libraries." +echo " - Logs are located in two places (application logs and uwsgi logs)." +echo " - /opt/kjv-api/logs/" +echo " - journalctl -e -u kjv-api.service" +echo " - If this install failed (you didn't get a Bible verse above) - try running /opt/kjv-api/kjv-api-test.sh" +echo " after stopping the kjv-api.service with systemctl, it should give you a traceback in your console." diff --git a/kjv-api-test.sh b/kjv-api-test.sh index 83d8962..4e0c2dd 100755 --- a/kjv-api-test.sh +++ b/kjv-api-test.sh @@ -2,9 +2,9 @@ # run from current directory only FILE=app.py if test -f "$FILE"; then - uwsgi_python310 --http-socket 0.0.0.0:1612 --wsgi-file app.py --callable app --pyargv "-vvv" --stats 0.0.0.0:9192 + uwsgi_python3 --http-socket 0.0.0.0:1612 --wsgi-file app.py --callable app --pyargv "-vvv" --stats 0.0.0.0:9192 else cd /opt/kjv-api echo "WARNING: RUNNING FROM /opt/kjv-api" - uwsgi_python310 --http-socket 0.0.0.0:1612 --wsgi-file /opt/kjv-api/app.py --callable app --pyargv "-vvv" + uwsgi_python3 --http-socket 0.0.0.0:1612 --wsgi-file /opt/kjv-api/app.py --callable app --pyargv "-vvv" fi diff --git a/kjv-api.sh b/kjv-api.sh index f72c5f6..f696fd4 100755 --- a/kjv-api.sh +++ b/kjv-api.sh @@ -1,3 +1,3 @@ #!/bin/sh cd /opt/kjv-api -uwsgi_python312 --http-socket :1611 --wsgi-file /opt/kjv-api/app.py --callable app --stats 127.0.0.1:9191 +uwsgi_python3 --http-socket :1611 --wsgi-file /opt/kjv-api/app.py --callable app --stats 127.0.0.1:9191