Update python scripts

diff --git a/ch06/playbooks/scripts/setadmin.py b/ch06/playbooks/scripts/setadmin.py
index 7800302..42c8da4 100644 (file)
--- a/ch06/playbooks/scripts/setadmin.py
+++ b/ch06/playbooks/scripts/setadmin.py
@@ -3,6 +3,7 @@
 # Assumes two environment variables
 #
 # PROJECT_DIR: the project directory (e.g., ~/projname)
+# PROJECT_APP: name of the project app
 # ADMIN_PASSWORD: admin user's password
 
 import os
@@ -12,10 +13,9 @@ import sys
 proj_dir = os.path.expanduser(os.environ['PROJECT_DIR'])
 sys.path.append(proj_dir)
 
-os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = proj_app + '%.settings'
 
-
-from mezzanine.utils.models import get_user_model
+from django.contrib.auth import get_user_model
 User = get_user_model()
 u, _ = User.objects.get_or_create(username='admin')
 u.is_staff = u.is_superuser = True

diff --git a/ch06/playbooks/scripts/setsite.py b/ch06/playbooks/scripts/setsite.py
index 9455624..d78f41b 100644 (file)
--- a/ch06/playbooks/scripts/setsite.py
+++ b/ch06/playbooks/scripts/setsite.py
@@ -2,9 +2,9 @@
 # A script to set the site domain
 # Assumes two environment variables
 #
-# PROJECT_DIR: the project directory (e.g., ~/projname)
 # WEBSITE_DOMAIN: the domain of the site (e.g., www.example.com)
-
+# PROJECT_DIR: root directory of the project
+# PROJECT_APP: name of the project app
 import os
 import sys
 
@@ -12,11 +12,12 @@ import sys
 proj_dir = os.path.expanduser(os.environ['PROJECT_DIR'])
 sys.path.append(proj_dir)
 
-os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+proj_app = os.environ['PROJECT_APP']
+os.environ['DJANGO_SETTINGS_MODULE'] = proj_app + '%.settings'
+import django
+django.setup()
 from django.conf import settings
 from django.contrib.sites.models import Site
-
 domain = os.environ['WEBSITE_DOMAIN']
 Site.objects.filter(id=settings.SITE_ID).update(domain=domain)
 Site.objects.get_or_create(domain=domain)
-