Skip to content

Commit 543b8c3

Browse files
mattstrattonclaude
andcommitted
Fix GitHub OAuth: use admin-configured social app only
Remove duplicate provider credentials from settings.py to avoid conflict with the Social Application configured in Django admin. Also fix deploy script to accept SSH key via -k flag, fix CSS import order, and use POST instead of PUT for Inertia form saves. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 2592bcd commit 543b8c3

File tree

3 files changed

+23
-15
lines changed

3 files changed

+23
-15
lines changed

config/settings.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,10 @@
115115
LOGIN_REDIRECT_URL = "/manage/"
116116
LOGOUT_REDIRECT_URL = "/"
117117

118+
# GitHub OAuth credentials are configured via Django Admin → Social Applications.
119+
# This keeps secrets out of settings and avoids duplicate provider registration.
118120
SOCIALACCOUNT_PROVIDERS = {
119121
"github": {
120-
"APP": {
121-
"client_id": env("GITHUB_CLIENT_ID", default=""),
122-
"secret": env("GITHUB_CLIENT_SECRET", default=""),
123-
},
124122
"SCOPE": ["user:email"],
125123
},
126124
}

deploy/deploy.sh

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,20 @@ set -euo pipefail
55
# After this, all deploys happen via GitHub Actions (push to main).
66
#
77
# Usage:
8-
# ./deploy/deploy.sh ec2-user@YOUR_IP beta.devopsdays.org
8+
# ./deploy/deploy.sh [-k keyfile] user@host domain
9+
#
10+
# Example:
11+
# ./deploy/deploy.sh -k ~/.ssh/devopsdays-web-app.pem ec2-user@1.2.3.4 beta.devopsdays.org
12+
13+
# Parse optional -k flag for SSH key
14+
SSH_OPTS=""
15+
if [ "${1:-}" = "-k" ]; then
16+
SSH_OPTS="-i ${2}"
17+
shift 2
18+
fi
919

10-
REMOTE="${1:?Usage: deploy.sh user@host domain}"
11-
DOMAIN="${2:?Usage: deploy.sh user@host domain}"
20+
REMOTE="${1:?Usage: deploy.sh [-k keyfile] user@host domain}"
21+
DOMAIN="${2:?Usage: deploy.sh [-k keyfile] user@host domain}"
1222
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
1323
PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
1424
APP_DIR="/opt/devopsdays-web-app"
@@ -17,16 +27,16 @@ echo "==> Setting up ${REMOTE} for ${DOMAIN}..."
1727

1828
# Copy only the files needed on the server (no source code!)
1929
echo "==> Copying deployment configs..."
20-
ssh "${REMOTE}" "mkdir -p ${APP_DIR}/deploy/nginx/conf.d"
30+
ssh ${SSH_OPTS} "${REMOTE}" "mkdir -p ${APP_DIR}/deploy/nginx/conf.d"
2131

22-
scp "${PROJECT_DIR}/docker-compose.prod.yml" "${REMOTE}:${APP_DIR}/"
23-
scp "${PROJECT_DIR}/env.prod.template" "${REMOTE}:${APP_DIR}/"
24-
scp "${PROJECT_DIR}/deploy/nginx/nginx.conf" "${REMOTE}:${APP_DIR}/deploy/nginx/"
25-
scp "${PROJECT_DIR}/deploy/nginx/conf.d/app.conf" "${REMOTE}:${APP_DIR}/deploy/nginx/conf.d/"
26-
scp "${PROJECT_DIR}/deploy/nginx/conf.d/app-initial.conf" "${REMOTE}:${APP_DIR}/deploy/nginx/conf.d/"
32+
scp ${SSH_OPTS} "${PROJECT_DIR}/docker-compose.prod.yml" "${REMOTE}:${APP_DIR}/"
33+
scp ${SSH_OPTS} "${PROJECT_DIR}/env.prod.template" "${REMOTE}:${APP_DIR}/"
34+
scp ${SSH_OPTS} "${PROJECT_DIR}/deploy/nginx/nginx.conf" "${REMOTE}:${APP_DIR}/deploy/nginx/"
35+
scp ${SSH_OPTS} "${PROJECT_DIR}/deploy/nginx/conf.d/app.conf" "${REMOTE}:${APP_DIR}/deploy/nginx/conf.d/"
36+
scp ${SSH_OPTS} "${PROJECT_DIR}/deploy/nginx/conf.d/app-initial.conf" "${REMOTE}:${APP_DIR}/deploy/nginx/conf.d/"
2737

2838
echo "==> Configuring server..."
29-
ssh "${REMOTE}" bash -s "${DOMAIN}" "${APP_DIR}" << 'REMOTE_SCRIPT'
39+
ssh ${SSH_OPTS} "${REMOTE}" bash -s "${DOMAIN}" "${APP_DIR}" << 'REMOTE_SCRIPT'
3040
set -euo pipefail
3141
DOMAIN="${1}"
3242
APP_DIR="${2}"

deploy/pulumi/Pulumi.prod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
config:
22
aws:region: us-east-1
33
devopsdays-web-app:instance_type: t3.small
4-
devopsdays-web-app:key_pair_name: ""
4+
devopsdays-web-app:key_pair_name: "devopsdays-web-app"

0 commit comments

Comments
 (0)