aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBobby <[email protected]>2022-11-10 23:57:03 -0500
committerBobby <[email protected]>2022-11-10 23:57:03 -0500
commit30c44f0148c40130320591bd56bca8707a251eec (patch)
tree8c36524dcb9bb774ba33125c31f7350835e64c45
parent8b1db418a4b09a6966cb8aa56a6a3821b880b6aa (diff)
downloadthatcomputerscientist-30c44f0148c40130320591bd56bca8707a251eec.tar.xz
thatcomputerscientist-30c44f0148c40130320591bd56bca8707a251eec.zip
Testing workflow
-rw-r--r--.github/workflows/main.yml18
-rw-r--r--thatcomputerscientist/settings.py4
2 files changed, 6 insertions, 16 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d522ac22..d7e5bb82 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,21 +1,11 @@
-# name: Fly Deploy
-# on: [push]
-# env:
-# FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
-# jobs:
-# deploy:
-# name: Deploy app
-# runs-on: ubuntu-latest
-# steps:
-# - uses: actions/checkout@v2
-# - uses: superfly/flyctl-actions/setup-flyctl@master
-# - run: flyctl deploy --remote-only
name: Deploy
on: [push]
jobs:
deploy:
name: Deploy App
- runs-on: thatcomputerscientist
+ runs-on: "self-hosted"
steps:
- uses: actions/checkout@v2
- - run: sh /home/ubuntu/deploy.sh
+ - name: Run Script
+ working-directory: _work
+ run: sh /home/ubuntu/deploy.sh
diff --git a/thatcomputerscientist/settings.py b/thatcomputerscientist/settings.py
index 6514ced5..16e481d9 100644
--- a/thatcomputerscientist/settings.py
+++ b/thatcomputerscientist/settings.py
@@ -31,7 +31,7 @@ SECRET_KEY = os.getenv('AUTHORIZATION_STRING')
DEBUG = True if os.getenv('ENVIRONMENT') == 'development' else False
ALLOWED_HOSTS = ["*"]
-CSRF_TRUSTED_ORIGINS = ['http://*.localhost', 'https://*.thatcomputerscientist.com', 'http://*.thatcomputerscientist.com', 'https://*.thatcomputerscientist.fly.dev/']
+CSRF_TRUSTED_ORIGINS = ['http://*.localhost', 'https://*.thatcomputerscientist.com', 'http://*.thatcomputerscientist.com']
SESSION_COOKIE_DOMAIN = "localhost" if os.getenv('ENVIRONMENT') == 'development' else ".thatcomputerscientist.com"
DOMAIN_NAME = "localhost" if os.getenv('ENVIRONMENT') == 'development' else "thatcomputerscientist.com"
@@ -97,7 +97,7 @@ WSGI_APPLICATION = 'thatcomputerscientist.wsgi.application'
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+ 'NAME': os.path.join(BASE_DIR, 'db.sqlite3') if os.getenv('ENVIRONMENT') == 'development' else '/home/ubuntu/database/db.sqlite3',
}
}