Skip to content

Commit

Permalink
Merge pull request #257 from ilausuch/remove_django_db_backup
Browse files Browse the repository at this point in the history
Remove django backup command
  • Loading branch information
asmorodskyi authored May 30, 2023
2 parents 70992ea + 6f3f9e6 commit d162b13
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 12 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
.cache
__pycache__
/db
/db.backups
# Also ignore templates
/templates
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@ htmlcov/*

# Configuration and program data
/db
/db.backups
pcw.ini
4 changes: 0 additions & 4 deletions container-startup
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ usage() {
echo " createuser USER PASS Create user"
echo " updaterun Do a regular instance scan and persist results to local DB"
echo " cleanup Cleanup old resources from providers"
echo " dbbackup Backup database"
echo " rmclusters Scan whole AWS account and delete ANY EKS clusters"
echo ""
echo "All other commands will be passed as arguments to 'manage.py'"
Expand Down Expand Up @@ -63,9 +62,6 @@ case "$CMD" in
"cleanup")
python3 manage.py cleanup
;;
"dbbackup")
python3 manage.py dbbackup
;;
"rmclusters")
python3 manage.py rmclusters
;;
Expand Down
3 changes: 1 addition & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@ google-cloud-storage==2.4.0
openstacksdk~=1.2.0
python-dateutil
apscheduler
kubernetes
django-dbbackup
kubernetes
4 changes: 0 additions & 4 deletions webui/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
'django_tables2',
'django_filters',
'bootstrap4',
'dbbackup',
]

MIDDLEWARE = [
Expand Down Expand Up @@ -96,9 +95,6 @@
}
}

DBBACKUP_STORAGE = 'django.core.files.storage.FileSystemStorage'
DBBACKUP_STORAGE_OPTIONS = {'location': os.path.join(BASE_DIR, 'db.backups')}


# Password validation
# https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators
Expand Down

0 comments on commit d162b13

Please sign in to comment.