Skip to content

Commit

Permalink
Merge branch 'main' into add-accessibility-linter
Browse files Browse the repository at this point in the history
  • Loading branch information
nitinawari authored Jan 18, 2025
2 parents db5e3da + 8adc3b1 commit b27133e
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 7 deletions.
23 changes: 23 additions & 0 deletions backend/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,29 @@ class Base(Configuration):

INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS

LOGGING = {
"version": 1,
"disable_existing_loggers": False,
"handlers": {
"console": {
"level": "DEBUG",
"class": "logging.StreamHandler",
},
},
"loggers": {
"django": {
"handlers": ["console"],
"level": "INFO",
"propagate": True,
},
"slack_bolt": {
"handlers": ["console"],
"level": "DEBUG",
"propagate": True,
},
},
}

MIDDLEWARE = [
"corsheaders.middleware.CorsMiddleware",
"django.middleware.security.SecurityMiddleware",
Expand Down
8 changes: 3 additions & 5 deletions backend/settings/local.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@
class Local(Base):
"""Local configuration."""

APP_NAME = "OWASP Nest Local"
CORS_ALLOWED_ORIGINS = ("http://localhost:3000",)
DEBUG = True

LOGGING = {}
SLACK_COMMANDS_ENABLED = True
SLACK_EVENTS_ENABLED = True

APP_NAME = "OWASP Nest Local"

CORS_ALLOWED_ORIGINS = ("http://localhost:3000",)
2 changes: 1 addition & 1 deletion frontend/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ npm-update:
@CMD="npm update" $(MAKE) exec-frontend-command-it

shell-frontend:
@CMD="/bin/bash" $(MAKE) exec-frontend-command-it
@CMD="/bin/sh" $(MAKE) exec-frontend-command-it

test-frontend:
@docker build -f frontend/Dockerfile.test frontend -t nest-test-frontend
Expand Down
5 changes: 4 additions & 1 deletion nginx/staging.conf
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,13 @@ server {

location ~ ^/(api|integrations|a)/ {
proxy_pass http://staging-nest-backend:8000;
proxy_set_header Authorization $http_authorization;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Slack-Request-Timestamp $http_x_slack_request_timestamp;
proxy_set_header X-Slack-Signature $http_x_slack_signature;
}
}

Expand Down

0 comments on commit b27133e

Please sign in to comment.