Compare commits
No commits in common. "f7ad46cc69263cb59d3c9f0b8307e32b68a9b95d" and "c06cfbdfa83f9cee908923349aadd4e6c1d1f79e" have entirely different histories.
f7ad46cc69
...
c06cfbdfa8
|
@ -81,7 +81,6 @@ def create_web_vhost_config(username, sitename, wildcard):
|
|||
domain=sitename, user=username,
|
||||
docroot=_build_document_root_path(sitename, username),
|
||||
wildcard=wildcard)
|
||||
conffile = None
|
||||
try:
|
||||
nginxtemp, filename = mkstemp()
|
||||
conffile = os.fdopen(nginxtemp, 'w')
|
||||
|
@ -163,7 +162,7 @@ def delete_web_vhost_config(sitename):
|
|||
"""
|
||||
try:
|
||||
subprocess.check_output([
|
||||
SUDO_CMD, RM_CMD, "-f", _build_vhost_config_path(sitename)],
|
||||
SUDO_CMD, RM_CMD, _build_vhost_config_path(sitename)],
|
||||
stderr=subprocess.STDOUT)
|
||||
except subprocess.CalledProcessError as cpe:
|
||||
log_and_raise(
|
||||
|
@ -183,7 +182,6 @@ def create_web_php_fpm_pool_config(username):
|
|||
"""
|
||||
conftmpl = _get_template('fpmpool.conf')
|
||||
confdata = conftmpl.render(user=username)
|
||||
conffile = None
|
||||
try:
|
||||
fpmtemp, filename = mkstemp()
|
||||
conffile = os.fdopen(fpmtemp, 'w')
|
||||
|
@ -218,7 +216,7 @@ def delete_web_php_fpm_pool_config(username):
|
|||
"""
|
||||
try:
|
||||
subprocess.check_output([
|
||||
SUDO_CMD, RM_CMD, "-f", _build_php_fpm_pool_file(username)],
|
||||
SUDO_CMD, RM_CMD, _build_php_fpm_pool_file(username)],
|
||||
stderr=subprocess.STDOUT)
|
||||
subprocess.check_output([
|
||||
SUDO_CMD, SERVICE_CMD, 'php5-fpm', 'reload'],
|
||||
|
|
Loading…
Reference in a new issue