Merge branch 'master' of bitbucket.org:ronnyabraham/fabric

modules/initialize.py

@@ -348,6 +348,9 @@ def get_config(branchname):
     dataobject.server.addbranch('nginx')
 
     dataobject.server.nginx.port = config['nginx']['port']
+    dataobject.server.nginx.socket = config['nginx']['socket']
+
+    print "DEBUG -- socket: %s" % dataobject.server.nginx.socket
 
     if config['project']['host'] == "localhost":
         dataobject.server.nginx.host = "{projectname}.{ext}".format(

modules/nginx.py

@@ -98,6 +98,7 @@ def upload():
     context['error_log'] = configuration.logging.nginx.error
 
     context['port'] = configuration.server.nginx.port
+    context['socket'] = configuration.server.nginx.socket
 
     context['django_host'] = configuration.server.django.host
     context['django_port'] = configuration.server.django.port

share/templates/readmes/paramiko.md

@@ -0,0 +1 @@
+env LDFLAGS="-L$(brew --prefix openssl)/lib" CFLAGS="-I$(brew --prefix openssl)/include" pip install cryptography