From 0728560972fd6f387cddb1bbbc6523b479f41535 Mon Sep 17 00:00:00 2001
From: Ronny Abraham <this.ronny@gmail.com>
Date: Wed, 7 Sep 2016 21:35:45 +0300
Subject: [PATCH] major tweaks to getting this to work 	deleted:   
 fabfile.pyc 	modified:   modules/deploy.py 	modified:  
 modules/initialize.py 	modified:   modules/nginx.py 	new file:  
 resources/ronnyabraham.pem

---
 fabfile.pyc                | Bin 1702 -> 0 bytes
 modules/deploy.py          |   6 ++++--
 modules/initialize.py      |   8 ++++++++
 modules/nginx.py           |   2 ++
 resources/ronnyabraham.pem |  23 +++++++++++++++++++++++
 5 files changed, 37 insertions(+), 2 deletions(-)
 delete mode 100644 fabfile.pyc
 create mode 100644 resources/ronnyabraham.pem

diff --git a/fabfile.pyc b/fabfile.pyc
deleted file mode 100644
index 7d1a17c06306d0c06ebccda44c4325b51c68a797..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1702
zcmcgs!EVz)5FM`*Cr+EDP+H(-4oFcC$+Z#)At4nmRLBJ(<$|{MHr>=&Ti#8jaxHg$
zgm2+z_yBmbPSTbG5{K4_XLn}SJM-SmZuqO;d;a6+=Zuz*!1x-k{SJ}iA5cLw4`>q5
zT+l>Nz*a#;NV67AT7FSTMVsakO`^u#qM}0|^ESyY<q>@&n#7cM{G>-pP~PSF6}H{*
zYP?c6z1mx;eNuh8BJ3*Yc({R_^lv;vPSb@D%3Qb>E7G1H4FjI_AWq7%P}1nHs<E+S
z-|_dkx==+~&6RO$(CmGK*T%dcpttXU@z@7BvI#qsTU5!ZJgIe-WTiRP(?u<vE=_W(
z3uT8`Lw^bT9=7o(t7<#0OJgp_Rb9?h=Il71Ni!`QEB2IUaz3i++1O^auHbjb-j17a
zJaCLrb?MrxRCaj698j<Z!Kw%G0uz96MCTFJ&&c`tOfcOrei3A1Ca;-;y;+-F#9l7#
z61I<(tCPia*uj1&UP?Jc8bNsPp)9})v#pJGS{7j2Q;eEuAZCiOFN#r1lbzi?Jt1Pr
zqIitKb|I*<8SIKUT2r*H^B$a_NJ0u!8w_1>kA*<b&182Wl4B>Q+Dwxha1zI4*v4TS
z=*dz&^8J#sG37?Pd%V6Kkc-;qq?l>yM4~PJAMX=<ntZ6se3AL4z6F^Pp>>x&+lQ)6
za&5VP;9Mh)e}M6yxF29aQ|DEQ`5NIqu}>kA8<)YYGN&Bj{&8_ZeM*O%A?HA?NDQ|y
z`g7LY2qRhP<~(vgyN3{SR0r44==vb0d;lERYUNuvU08pF{l&?f_+I6pzF|{doeo%R
iL)?A;a*8jT^j<L(`v_uB48*qR#Zefy;+?@3e%(LS@qlsw

diff --git a/modules/deploy.py b/modules/deploy.py
index efeffcc..a449f0f 100644
--- a/modules/deploy.py
+++ b/modules/deploy.py
@@ -7,8 +7,6 @@ from fabric.operations import run
 from utils import virtualenv_source, booleanize, loggify
 from utils import print_console
 
-from database import drop_all as db_drop_all
-
 from pip import setup_virtualenv
 from pip import setup as pip_requirements
 
@@ -337,6 +335,9 @@ def test():
 
 @task
 def remove(full=True):
+    """
+    remove the project, delete the database
+    """
     full = booleanize(full)
 
     configuration = env.config
@@ -428,6 +429,7 @@ def remove(full=True):
         nginx_remove()
         supervisor_remove()
 
+        from database import drop_all as db_drop_all
         db_drop_all()
 
         #
diff --git a/modules/initialize.py b/modules/initialize.py
index de35524..c7fefb5 100644
--- a/modules/initialize.py
+++ b/modules/initialize.py
@@ -667,6 +667,14 @@ def _init_backups(configuration, config, layout):
         configuration.paths.server.backups.root,
         layout['paths']['backups']['database'])
 
+    configuration.paths.server.backups.fixtures = os.path.join(
+        configuration.paths.server.backups.root,
+        layout['paths']['backups']['fixtures'])
+
+    configuration.paths.server.backups.media = os.path.join(
+        configuration.paths.server.backups.root,
+        layout['paths']['backups']['media'])
+
     # check to see if there is an overriden folder name for the backup path
     # if there is, then apply THE FULL PATH, don't tack it onto the root server
     # path.  Here I am assuming that the full corrected path is being given
diff --git a/modules/nginx.py b/modules/nginx.py
index 8fe4fb6..c62f341 100644
--- a/modules/nginx.py
+++ b/modules/nginx.py
@@ -102,6 +102,8 @@ def upload():
     context['django_host'] = configuration.server.django.host
     context['django_port'] = configuration.server.django.port
 
+    context['extended_name'] = configuration.project.extendedname
+
     context['virtualenv_sitepackages'] = \
         configuration.virtualenv.paths.sitepackages
 
diff --git a/resources/ronnyabraham.pem b/resources/ronnyabraham.pem
new file mode 100644
index 0000000..c74f2a0
--- /dev/null
+++ b/resources/ronnyabraham.pem
@@ -0,0 +1,23 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAvEr+QT7IA6V4JwElXuOV1mHdLcakErLh1M/dtpd+oiXzj5MjXeZrnYlgyGtv
+yOVIEw+K3t0d0jIAXCh8/OzRq8euzAah4GXS3Q9T+9zFhvcf6XvSDQh88Ho06WtxTjTuTZ9xgFEF
+x9iOqKxkr6kn0OH+26bCl92SysDrld2s0FK6Qv0Z8hBHI8yrDG1ENNQOOMoVsgLkjg3E4UGpQ/KJ
+XkBR/vFCez9YWj1EFwTGaP26Y+RAHY4E57TDuhDU9/xBUeFoZ7GLfuRxxJo6hK1oLfJrPs0yfYVX
+dA1yQ8qi+X/MzLk09TTN65aDoeWW7gNppGZSINgtxG4mvtSXKhUxcwIDAQABAoIBAE+ZQFzipnls
+JRwQDvVLLpefbXohhFDnUDK/4RGEf6MaehlS8VuLwiip38E6MdpymwJ7ypAmV6n5O0+6SgQ+NPDy
+jEFx+FK9mOOczDsn/FTu+Y2hq42Y7gBXGTEoG5EdLTShV8EP/2qZcM17e2ELGGrkbvH6UD8VCy4t
+WipTuO+jnv55mQC5OrE2/Otqu5qCRX/iLY51+zpK197YNIHX4vL7eXzGIpEIG+BcVA+ErTfcr7ib
+htZp2gERcwqMz/zmy5zaJmzzcNSgSaN8zS3171dEZiYcbf9gj6BCTLHbyqaLy4/U3O4RxDF1HJdF
+KqJzqZEqahX8BxoQxWAx7tE0Z+kCgYEA8AHt/0TkPpAhS6/Y6TSk/aKxIkiNqHl5rAhDpimVpw8M
+W+/3pe93TY7p4bKBnckXaxV75GorB/qR5Ag+DQSw6MD2KG0hKRJyRoHyePExmW9yM/CjswYTVjCk
+eOK4unJ1DzcHNtU2P19enGpmfuAlraEhIJSsZfHa6AHG89Mt5S0CgYEAyNbpR5S2Bd/lFeqtvPaT
+Pz95NhVZPV8ZopNpqqMDPMgPnXYI2s4VOfrKcMfy21WjEDraYzRPFwfYcWKP7FTrTGjDYDeIOjWo
+4LjAFrVWtJLx5P0je0X31LMPaMJbCjR3oqvlRNAuJDf0PvVSAKu0ZL/0ndktiQ/sDtGvDh441R8C
+gYEA10Izzj5go8grRLHbzxV7YUy4qDIAc3k36lajLfWgFmyFvjOUnswO6Y3jMJ0kaXsBOPbU3oFm
+RMq0bJwD4zMw5CCk5o8yLZ8wxRIpgdV5kc8F05XhjGBHmYcZDJ7z5a1gVhwZqVFDTUVhGtLHSMYK
+pRaeGpWdpfVsS6fEY80lHaUCgYEAlVlzij5lCYNQmPa2EgIOx4bM/VHs1b2Fk6cpebHVM3rWWdKv
+jP6ZPE9qAWo/B6nsI6KQShtZARhddRvFSQpxG5YAS+mfzSGgHtRkS7635norlYxEuWPzguFRASce
+ij0wBfDsAjsJRPezEqpdO5B0CkPQhR0+RmFnujFliwsgWiMCgYEAn0BHCVO0kuT2QlKc2TjdewsQ
+uLe0SbWIAuIQJLu9XJMCInktYPbXwrNKjpIRnsx1xbDYBpYfratDDoO9aXdhgrMqOJmUzkNlfmPl
+bT9Vk1sh99iIrsiiaxCTqoccDmB/kY2onkw7JVtGRJIgZ+6FRFDF3mtN1vipl1yfASo0AM0=
+-----END RSA PRIVATE KEY-----
\ No newline at end of file