Skip to content

Commit

Permalink
Secret key issue done
Browse files Browse the repository at this point in the history
Signed-off-by: sumitdhiman <hello@sumitdhiman.in>
  • Loading branch information
lucifer1708 committed Jul 30, 2023
2 parents b91fa13 + 07ca511 commit 1dd171d
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 68 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/workflow.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: CI/CD Pipeline

on:
push:
branches:
- main

jobs:
test_and_deploy:
runs-on: ubuntu-latest

steps:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.10'

- name: Checkout code
uses: actions/checkout@v2

- name: Set up SSH
uses: webfactory/ssh-agent@v0.5.1
with:
ssh-private-key: ${{ secrets.SSH_KEY_ACCESS }}

- name: Deploy to EC2 instance
run: |
ssh -o StrictHostKeyChecking=no lucifer@sumitdhiman.in << EOF
cd join.istenith.com
git config pull.rebase false
git pull origin stage
docker compose up --build -d
EOF
10 changes: 7 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
version: '3.7'
version: '3'

services:
app:
volumes:
- /media
- /db.sqlite3
- media:/media
- db:/db.sqlite3
build: .
ports:
- "8081:8081"
command: gunicorn --bind 0.0.0.0:8081 main.wsgi

volumes:
media:
db:
125 changes: 60 additions & 65 deletions main/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,80 +8,83 @@
# See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/

# SECURITY WARNING: keep the secret key used in production secret!
<<<<<<< HEAD
SECRET_KEY = os.environ.get('SECRET_KEY')

# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False
=======
SECRET_KEY = "a)*#0p#x9s4_g!p5mrh*4bars7z^ub(^8t@e7mn9cao24r(e#+"

ALLOWED_HOSTS = ['*']
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
>>>>>>> 07ca51131a05759ca3fd9d0c2e50d8eaba94798d

ALLOWED_HOSTS = ["*"]

CSRF_TRUSTED_ORIGINS = [
'https://join.istenith.com',
'http://join.istenith.com',
'http://127.0.0.1:8000/',
'https://interview-iste.azurewebsites.net',
'http://interview-iste.azurewebsites.net'
"https://join.istenith.com",
"http://join.istenith.com",
"http://0.0.0.0:8081"
]

INSTALLED_APPS = [
'forms',
'solo',
'results',
'phonenumber_field',
'adminactions',
'jazzmin',
'widget_tweaks',
'import_export',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
"forms",
"solo",
"results",
"phonenumber_field",
"adminactions",
"jazzmin",
"widget_tweaks",
"import_export",
"django.contrib.admin",
"django.contrib.auth",
"django.contrib.contenttypes",
"django.contrib.sessions",
"django.contrib.messages",
"django.contrib.staticfiles",
]

MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
"django.middleware.security.SecurityMiddleware",
"django.contrib.sessions.middleware.SessionMiddleware",
"django.middleware.common.CommonMiddleware",
"django.middleware.csrf.CsrfViewMiddleware",
"django.contrib.auth.middleware.AuthenticationMiddleware",
"django.contrib.messages.middleware.MessageMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware",
]

ROOT_URLCONF = 'main.urls'
ROOT_URLCONF = "main.urls"

TEMPLATES = [
{
'BACKEND':
'django.template.backends.django.DjangoTemplates',
'DIRS': [
"BACKEND": "django.template.backends.django.DjangoTemplates",
"DIRS": [
os.path.join(BASE_DIR, "templates"),
os.path.join(BASE_DIR, "templates", "jazzmin")
os.path.join(BASE_DIR, "templates", "jazzmin"),
],
'APP_DIRS':
True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
"APP_DIRS": True,
"OPTIONS": {
"context_processors": [
"django.template.context_processors.debug",
"django.template.context_processors.request",
"django.contrib.auth.context_processors.auth",
"django.contrib.messages.context_processors.messages",
],
},
},
]

WSGI_APPLICATION = 'main.wsgi.application'
WSGI_APPLICATION = "main.wsgi.application"

# Database
# https://docs.djangoproject.com/en/3.1/ref/settings/#databases

DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': BASE_DIR / 'db.sqlite3',
"default": {
"ENGINE": "django.db.backends.sqlite3",
"NAME": BASE_DIR / "db.sqlite3",
}
}

Expand All @@ -90,29 +93,25 @@

AUTH_PASSWORD_VALIDATORS = [
{
'NAME':
'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
"NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
},
{
'NAME':
'django.contrib.auth.password_validation.MinimumLengthValidator',
"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
},
{
'NAME':
'django.contrib.auth.password_validation.CommonPasswordValidator',
"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
},
{
'NAME':
'django.contrib.auth.password_validation.NumericPasswordValidator',
"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
},
]

# Internationalization
# https://docs.djangoproject.com/en/3.1/topics/i18n/

LANGUAGE_CODE = 'en-us'
LANGUAGE_CODE = "en-us"

TIME_ZONE = 'UTC'
TIME_ZONE = "UTC"

USE_I18N = True

Expand All @@ -122,12 +121,12 @@

# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/3.1/howto/static-files/
STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, 'static_root')
MEDIA_ROOT = BASE_DIR / 'media'
MEDIA_URL = '/media/'
STATIC_URL = "/static/"
STATIC_ROOT = os.path.join(BASE_DIR, "static_root")
MEDIA_ROOT = BASE_DIR / "media"
MEDIA_URL = "/media/"

STATICFILES_DIRS = (os.path.join(BASE_DIR, 'static'), )
STATICFILES_DIRS = (os.path.join(BASE_DIR, "static"),)

JAZZMIN_UI_TWEAKS = {
"theme": "flatly",
Expand All @@ -148,15 +147,11 @@
"site_logo": "images/iste.png",
"site_logo_classes": "img-circle",
"topmenu_links": [
{
"name": "Home",
"url": "/",
"new_window": True
},
{"name": "Home", "url": "/", "new_window": True},
],
}

CRISPY_TEMPLATE_PACK = 'bootstrap4'
CRISPY_TEMPLATE_PACK = "bootstrap4"

# SMTP setup
# EMAIL_HOST= 'smtp.gmail.com'
Expand Down

0 comments on commit 1dd171d

Please sign in to comment.