diff --git a/fabfile.pyc b/fabfile.pyc deleted file mode 100644 index 7d1a17c..0000000 Binary files a/fabfile.pyc and /dev/null differ 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