django-repositories/fabric
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Ronny Abraham 2017-08-28 23:54:26 +03:00
commit efabadf786
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/initialize.py
View file

@ -348,6 +348,9 @@ def get_config(branchname):
dataobject.server.addbranch('nginx') dataobject.server.addbranch('nginx')
dataobject.server.nginx.port = config['nginx']['port'] 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": if config['project']['host'] == "localhost":
dataobject.server.nginx.host = "{projectname}.{ext}".format( dataobject.server.nginx.host = "{projectname}.{ext}".format(

1
modules/nginx.py
View file

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

1
share/templates/readmes/paramiko.md Normal file
View file

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