Page MenuHomeDevCentral
Files F4792817

D1979.diff
No OneTemporary
Actions

D1979.diff
View Options

diff --git a/_modules/zr.py b/_modules/zr.py
--- a/_modules/zr.py
+++ b/_modules/zr.py
@@ -14,9 +14,9 @@
def __virtual__():
- '''
+ """
Only load if zr exists on the system
- '''
+ """
return path_which('zr') is not None,\
"The Zemke-Rhyne execution module cannot be loaded: zr not installed."
@@ -26,7 +26,7 @@
def _get_credential_id_from_pillar_key(expression):
- '''Gets credentials id from a dot pillar path, e.g. nasqueron.foo.bar'''
+ """Gets credentials id from a dot pillar path, e.g. nasqueron.foo.bar"""
key = _build_pillar_key(expression)
return __salt__['pillar.get'](key)
diff --git a/roles/paas-docker/wrappers/files/pad-delete.py b/roles/paas-docker/wrappers/files/pad-delete.py
--- a/roles/paas-docker/wrappers/files/pad-delete.py
+++ b/roles/paas-docker/wrappers/files/pad-delete.py
@@ -26,7 +26,7 @@
# Read API key
with open(API_KEY_FILE) as api_file:
- key=api_file.read().strip()
+ key = api_file.read().strip()
# Fire request
url = "https://" + PAD_HOST + "/api/1/deletePad?apikey=" + key + "&padID=" + pad
diff --git a/roles/webserver-legacy/php-builder/source.sls b/roles/webserver-legacy/php-builder/source.sls
--- a/roles/webserver-legacy/php-builder/source.sls
+++ b/roles/webserver-legacy/php-builder/source.sls
@@ -122,7 +122,7 @@
"make"
]},
{'user': builder_user},
- {'creates': directory + "/configure"},
+ {'creates': directory + "/configure"},
]}
config["php_build_" + build_name + "_phase2_install"] = {'cmd.run': [
diff --git a/roles/webserver-legacy/php-sites/cleanup.sls b/roles/webserver-legacy/php-sites/cleanup.sls
--- a/roles/webserver-legacy/php-sites/cleanup.sls
+++ b/roles/webserver-legacy/php-sites/cleanup.sls
@@ -12,6 +12,7 @@
# That allows to move pools among instances.
# -------------------------------------------------------------
+
def get_etc_dir():
if __grains__['os'] == 'FreeBSD':
return "/usr/local/etc"
@@ -23,7 +24,7 @@
files = []
etc_dir = get_etc_dir()
for instance in __pillar__['php_fpm_instances']:
- files.extend([etc_dir + "/php-fpm.d/" + instance + "-pools/" + site['user'] + ".conf"
+ files.extend([etc_dir + "/php-fpm.d/" + instance + "-pools/" + site['user'] + ".conf"
for _, site in __pillar__['web_php_sites'].items()
if site['php-fpm'] != instance])

File Metadata

Mime Type
text/plain
Expires
Thu, Feb 27, 21:17 (1 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2447835
Default Alt Text
D1979.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator