diff options
| author | D Delmar Davis <don@suspectdevices.com> | 2025-01-10 16:37:47 -0800 |
|---|---|---|
| committer | D Delmar Davis <don@suspectdevices.com> | 2025-01-10 16:37:47 -0800 |
| commit | b56afacfdc14723f24c5ff661ce6760d8a76f827 (patch) | |
| tree | fc79c0e2bc590716fb578e9bf700a5ef327ccd6d | |
| parent | 3d9064dd5a4e58690c68cd8f1959248a1d28264b (diff) | |
Move things into place.
| -rwxr-xr-x | makesite.sh | 2 | ||||
| -rw-r--r-- | whiskey/drink.py | 4 | ||||
| -rw-r--r-- | whiskey/files/bartender-nginx.conf | 2 | ||||
| -rw-r--r-- | whiskey/files/whiskey.service | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/makesite.sh b/makesite.sh index 8f646ed..9ae3bc8 100755 --- a/makesite.sh +++ b/makesite.sh @@ -7,4 +7,4 @@ mv ../site ../osite mv site .. echo "=========================== Done: `date` ====================" -}| tee logs/pullandbuild.out +}| tee logs/mksite.bartender.out diff --git a/whiskey/drink.py b/whiskey/drink.py index 4a0ae0d..5c4b88e 100644 --- a/whiskey/drink.py +++ b/whiskey/drink.py @@ -35,9 +35,13 @@ def whiskey(style): abort(400, "I am going to need to see some id.") # After we have detemined that this is legit. + # This should be moved to a .env or some other map. Ie style->repo-location + # match style: case "neat": subprocess.call(['at', 'now', '-f', '/var/www/digithink/repo/makesite.sh']) + case "lemonade": + subprocess.call(['at', 'now', '-f', '/var/www/bartender/repo/makesite.sh']) case "sour": subprocess.call(['at', 'now', '-f', '/var/www/3dangst/repo/makesite.sh']) case _: abort(404,"We Don't Serve That Here!") diff --git a/whiskey/files/bartender-nginx.conf b/whiskey/files/bartender-nginx.conf index b0eebaa..b2730ff 100644 --- a/whiskey/files/bartender-nginx.conf +++ b/whiskey/files/bartender-nginx.conf @@ -7,7 +7,7 @@ server { ssl_certificate /etc/letsencrypt/live/bartender.digithink.com/fullchain.pem; # managed by Certbot ssl_certificate_key /etc/letsencrypt/live/bartender.digithink.com/privkey.pem; # managed by Certbot - root /var/www/digithink/whiskey/bartender; + root /var/www/bartender/site; index index.html; location /whiskey { include proxy_params; diff --git a/whiskey/files/whiskey.service b/whiskey/files/whiskey.service index d7e968e..fb60373 100644 --- a/whiskey/files/whiskey.service +++ b/whiskey/files/whiskey.service @@ -5,7 +5,7 @@ After=network.target [Service] User=www-data Group=www-data -WorkingDirectory=/var/www/digithink/whiskey +WorkingDirectory=/var/www/bartender/repo/whiskey #Environment="PATH=/home/sammy/myproject/myprojectenv/bin" # --bind unix:/run/whiskey.sock \ |