From 8d8cb5453639ca6d991f28e800cbf6e16b3f4d80 Mon Sep 17 00:00:00 2001 From: afabiani Date: Wed, 9 May 2018 11:21:19 +0200 Subject: [PATCH] - Minor fixes to backup & restore commands --- geonode/base/management/commands/backup.py | 9 ++++++++- geonode/base/management/commands/restore.py | 9 ++++++++- geonode/base/management/commands/settings.ini | 4 ++-- scripts/backup-restore/backup.py | 9 ++++++++- scripts/backup-restore/restore.py | 9 ++++++++- scripts/backup-restore/settings.ini | 4 ++-- 6 files changed, 36 insertions(+), 8 deletions(-) diff --git a/geonode/base/management/commands/backup.py b/geonode/base/management/commands/backup.py index daa035df17b..e152d119408 100644 --- a/geonode/base/management/commands/backup.py +++ b/geonode/base/management/commands/backup.py @@ -345,7 +345,14 @@ def handle(self, **options): print "Saved Static Files from '"+static_files_folder+"'." # Store Template Folders - template_folders = settings.TEMPLATE_DIRS + template_folders = [] + try: + template_folders = settings.TEMPLATE_DIRS + except: + try: + template_folders = settings.TEMPLATES[0]['DIRS'] + except: + pass template_files_folders = os.path.join(target_folder, helpers.TEMPLATE_DIRS) if not os.path.exists(template_files_folders): os.makedirs(template_files_folders) diff --git a/geonode/base/management/commands/restore.py b/geonode/base/management/commands/restore.py index 0415b965172..96dac308efa 100755 --- a/geonode/base/management/commands/restore.py +++ b/geonode/base/management/commands/restore.py @@ -288,7 +288,14 @@ def handle(self, **options): static_folder = os.path.join(target_folder, helpers.STATIC_ROOT) static_folders = settings.STATICFILES_DIRS static_files_folders = os.path.join(target_folder, helpers.STATICFILES_DIRS) - template_folders = settings.TEMPLATE_DIRS + template_folders = [] + try: + template_folders = settings.TEMPLATE_DIRS + except: + try: + template_folders = settings.TEMPLATES[0]['DIRS'] + except: + pass template_files_folders = os.path.join(target_folder, helpers.TEMPLATE_DIRS) locale_folders = settings.LOCALE_PATHS locale_files_folders = os.path.join(target_folder, helpers.LOCALE_PATHS) diff --git a/geonode/base/management/commands/settings.ini b/geonode/base/management/commands/settings.ini index cf3da56750b..ad11a7383e2 100755 --- a/geonode/base/management/commands/settings.ini +++ b/geonode/base/management/commands/settings.ini @@ -14,8 +14,8 @@ dumprasterdata = yes # dumps = people,accounts,avatars,backups,licenses,topiccategories,regions,spatialrepresentationtypes,restrictioncodetypes,resourcebases,contactroles,links,useropermissions,groupopermissions,uploadsessions,styles,layers,attributes,layerfiles,maps,maplayers,mapsnapshots,documents,tags # 2.6+ -apps = contenttypes,auth,people,groups,account,actstream,admin,agon_ratings,announcements,avatar,base,dialogos,documents,guardian,invitations,layers,maps,oauth2_provider,pinax_notifications,services,sessions,sites,taggit,tastypie,upload,user_messages -dumps = contenttypes,auth,people,groups,account,actstream,admin,agon_ratings,announcements,avatar,base,dialogos,documents,guardian,invitations,layers,maps,oauth2_provider,pinax_notifications,services,sessions,sites,taggit,tastypie,upload,user_messages +apps = contenttypes,auth,people,groups,account,guardian,admin,actstream,agon_ratings,announcements,avatar,base,dialogos,documents,geoserver,invitations,layers,maps,oauth2_provider,pinax_notifications,services,sites,socialaccount,taggit,tastypie,upload,user_messages +dumps = contenttypes,auth,people,groups,account,guardian,admin,actstream,agon_ratings,announcements,avatar,base,dialogos,documents,geoserver,invitations,layers,maps,oauth2_provider,pinax_notifications,services,sites,socialaccount,taggit,tastypie,upload,user_messages # Migrate from GN 2.0 to GN 2.4 # migrations = base.resourcebase,layers.layer,layers.attribute,maps.map,maps.maplayer diff --git a/scripts/backup-restore/backup.py b/scripts/backup-restore/backup.py index 47520be9e28..1d35ead9fe7 100755 --- a/scripts/backup-restore/backup.py +++ b/scripts/backup-restore/backup.py @@ -81,7 +81,14 @@ def backup_full(): print "Saved Static Files from '"+static_files_folder+"'." # Store Template Folders - template_folders = settings.TEMPLATE_DIRS + template_folders = [] + try: + template_folders = settings.TEMPLATE_DIRS + except: + try: + template_folders = settings.TEMPLATES[0]['DIRS'] + except: + pass template_files_folders = os.path.join(target_folder, helpers.TEMPLATE_DIRS) if not os.path.exists(template_files_folders): os.makedirs(template_files_folders) diff --git a/scripts/backup-restore/restore.py b/scripts/backup-restore/restore.py index e316417eb88..81b304c7d79 100755 --- a/scripts/backup-restore/restore.py +++ b/scripts/backup-restore/restore.py @@ -114,7 +114,14 @@ def restore_full(archive): print "Static Files Restored into '"+static_files_folder+"'." # Restore Template Folders - template_folders = settings.TEMPLATE_DIRS + template_folders = [] + try: + template_folders = settings.TEMPLATE_DIRS + except: + try: + template_folders = settings.TEMPLATES[0]['DIRS'] + except: + pass template_files_folders = os.path.join(target_folder, helpers.TEMPLATE_DIRS) for template_files_folder in template_folders: diff --git a/scripts/backup-restore/settings.ini b/scripts/backup-restore/settings.ini index d13515ea214..1534bb1db6b 100755 --- a/scripts/backup-restore/settings.ini +++ b/scripts/backup-restore/settings.ini @@ -12,8 +12,8 @@ passwd = geonode # dumps = people,accounts,avatars,backups,licenses,topiccategories,regions,spatialrepresentationtypes,restrictioncodetypes,resourcebases,contactroles,links,useropermissions,groupopermissions,uploadsessions,styles,layers,attributes,layerfiles,maps,maplayers,mapsnapshots,documents,tags # 2.6+ -apps = contenttypes,auth,people,groups,account,actstream,admin,agon_ratings,announcements,avatar,base,dialogos,documents,guardian,invitations,layers,maps,oauth2_provider,pinax_notifications,services,sessions,sites,taggit,tastypie,upload,user_messages -dumps = contenttypes,auth,people,groups,account,actstream,admin,agon_ratings,announcements,avatar,base,dialogos,documents,guardian,invitations,layers,maps,oauth2_provider,pinax_notifications,services,sessions,sites,taggit,tastypie,upload,user_messages +apps = contenttypes,auth,people,groups,account,guardian,admin,actstream,agon_ratings,announcements,avatar,base,dialogos,documents,geoserver,invitations,layers,maps,oauth2_provider,pinax_notifications,services,sites,socialaccount,taggit,tastypie,upload,user_messages +dumps = contenttypes,auth,people,groups,account,guardian,admin,actstream,agon_ratings,announcements,avatar,base,dialogos,documents,geoserver,invitations,layers,maps,oauth2_provider,pinax_notifications,services,sites,socialaccount,taggit,tastypie,upload,user_messages # Migrate from GN 2.0 to GN 2.4 # migrations = base.resourcebase,layers.layer,layers.attribute,maps.map,maps.maplayer