diff --git a/.envrc.example b/.envrc.example index e1ebd403..73fa8df2 100644 --- a/.envrc.example +++ b/.envrc.example @@ -1,5 +1,24 @@ +# Exceptions and tracebacks on errors +# 1: show +# 0: don't show export DEBUG=1 + +# Stop real emails and turn https off +# 1: stop and off +# 0: do not stop and on +export LOCALDEV_MODE=1 + +# Session cookies secret export SECRET_KEY=some-secret-key -export DATABASE_URL=postgres://mataroa:db-password@db:5432/mataroa -export EMAIL_HOST_USER=smtp-user -export EMAIL_HOST_PASSWORD=smtp-password + +# Database connection +export DATABASE_URL=postgres://mataroa:xxx@localhost:5432/mataroa + +# SMTP credentials +export EMAIL_HOST_USER= +export EMAIL_HOST_PASSWORD= + +# Stripe payments details +export STRIPE_API_KEY= +export STRIPE_PUBLIC_KEY= +export STRIPE_PRICE_ID= diff --git a/ansible/.envrc.example b/ansible/.envrc.example index 4ffd8978..f69f78bf 100644 --- a/ansible/.envrc.example +++ b/ansible/.envrc.example @@ -12,8 +12,15 @@ export DOMAIN=mataroa.blog export EMAIL=admin@mataroa.blog # Show exceptions and tracebacks on errors +# 1: show +# 0: don't show export DEBUG=1 +# Stop real emails and turn https off +# 1: stop and off +# 0: do not stop and on +export LOCALDEV_MODE=1 + # Session cookies secret export SECRET_KEY=some-secret-key diff --git a/ansible/mataroa.service.j2 b/ansible/mataroa.service.j2 index 073eaef0..2fd2e831 100644 --- a/ansible/mataroa.service.j2 +++ b/ansible/mataroa.service.j2 @@ -9,7 +9,10 @@ Group=www-data WorkingDirectory=/var/www/mataroa ExecStart=/var/www/mataroa/.venv/bin/gunicorn -b 127.0.0.1:5000 -w 4 mataroa.wsgi ExecReload=/bin/kill -HUP $MAINPID +Environment="DOMAIN={{ domain }}" +Environment="EMAIL={{ email }}" Environment="DEBUG={{ debug }}" +Environment="LOCALDEV_MODE={{ localdev_mode }}" Environment="SECRET_KEY={{ secret_key }}" Environment="DATABASE_URL={{ database_url }}" Environment="EMAIL_HOST_USER={{ email_host_user }}" diff --git a/ansible/vars.yaml b/ansible/vars.yaml index 52ee280a..1ad11261 100644 --- a/ansible/vars.yaml +++ b/ansible/vars.yaml @@ -3,6 +3,7 @@ domain: "{{ lookup('env', 'DOMAIN') }}" email: "{{ lookup('env', 'EMAIL') }}" debug: "{{ lookup('env', 'DEBUG') }}" +localdev_mode: "{{ lookup('env', 'LOCALDEV_MODE') }}" secret_key: "{{ lookup('env', 'SECRET_KEY') }}" diff --git a/mataroa/settings.py b/mataroa/settings.py index 84ff7aa9..90cb7988 100644 --- a/mataroa/settings.py +++ b/mataroa/settings.py @@ -27,6 +27,8 @@ # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True if os.environ.get("DEBUG") == "1" else False +LOCALDEV_MODE = True if os.environ.get("LOCALDEV_MODE") == "1" else False + ALLOWED_HOSTS = [ "127.0.0.1", "localhost", @@ -38,7 +40,7 @@ ADMINS = [("Theodore Keloglou", "zf@sirodoht.com")] CANONICAL_HOST = os.environ.get("DOMAIN", "mataroa.blog") -if DEBUG: +if LOCALDEV_MODE: CANONICAL_HOST = "mataroalocal.blog:8000" @@ -174,7 +176,7 @@ # Email EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend" -if DEBUG: +if LOCALDEV_MODE: EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend" EMAIL_USE_TLS = True EMAIL_HOST = "smtp.postmarkapp.com" @@ -192,7 +194,7 @@ # Security middleware -if not DEBUG: +if not LOCALDEV_MODE: SECURE_CONTENT_TYPE_NOSNIFF = True X_FRAME_OPTIONS = "DENY" SESSION_COOKIE_SECURE = True