Page MenuHomeDevCentral
Files F25194151

D4047.diff
No OneTemporary
Actions

D4047.diff
View Options

diff --git a/roles/devserver/poudriere/content.sls b/roles/devserver/poudriere/content.sls
--- a/roles/devserver/poudriere/content.sls
+++ b/roles/devserver/poudriere/content.sls
@@ -52,7 +52,6 @@
{"creates": f"/usr/local/poudriere/jails/base{major}"},
]
},
-
"poudriere_ports_default": {
"cmd.run": [
{"name": "poudriere ports -c -m git+https -B main"},
diff --git a/roles/viperserv/eggdrop/cron.sls b/roles/viperserv/eggdrop/cron.sls
--- a/roles/viperserv/eggdrop/cron.sls
+++ b/roles/viperserv/eggdrop/cron.sls
@@ -14,25 +14,26 @@
def get_etc_dir():
- if __grains__['os'] == 'FreeBSD':
- return "/usr/local/etc"
+ if __grains__["os"] == "FreeBSD":
+ return "/usr/local/etc"
- return "/etc"
+ return "/etc"
def get_bin_dir():
- if __grains__['os'] == 'FreeBSD':
+ if __grains__["os"] == "FreeBSD":
return "/usr/local/bin"
return "/bin"
def get_eggdrops():
- '''Filter eggdrops to select the ones with ensure_is_live: True'''
- return [botname
- for botname, bot
- in __pillar__['viperserv_bots'].items()
- if 'ensure_is_live' in bot and bot['ensure_is_live']]
+ """Filter eggdrops to select the ones with ensure_is_live: True"""
+ return [
+ botname
+ for botname, bot in __pillar__["viperserv_bots"].items()
+ if "ensure_is_live" in bot and bot["ensure_is_live"]
+ ]
# -------------------------------------------------------------
@@ -41,25 +42,30 @@
def run():
- script = get_bin_dir() + '/ensure-eggdrops-are-live'
+ script = get_bin_dir() + "/ensure-eggdrops-are-live"
return {
- get_etc_dir() + '/eggdrops-live.conf': {'file.managed': [
- {'source': 'salt://roles/viperserv/eggdrop/files/eggdrops-live.conf'},
- {'template': 'jinja'},
- {'context': {
- 'eggdrops': get_eggdrops()
- }},
- ]},
-
- script: {'file.managed': [
- {'source': 'salt://roles/viperserv/eggdrop/files/ensure-eggdrops-are-live.sh'},
- {'mode': 755},
- ]},
-
- 'eggdrop_crontab': {'cron.present': [
- {'name': script},
- {'minute': '*/5'},
- {'identifier': 'viperserv.eggdrop'},
- ]}
+ get_etc_dir()
+ + "/eggdrops-live.conf": {
+ "file.managed": [
+ {"source": "salt://roles/viperserv/eggdrop/files/eggdrops-live.conf"},
+ {"template": "jinja"},
+ {"context": {"eggdrops": get_eggdrops()}},
+ ]
+ },
+ script: {
+ "file.managed": [
+ {
+ "source": "salt://roles/viperserv/eggdrop/files/ensure-eggdrops-are-live.sh"
+ },
+ {"mode": 755},
+ ]
+ },
+ "eggdrop_crontab": {
+ "cron.present": [
+ {"name": script},
+ {"minute": "*/5"},
+ {"identifier": "viperserv.eggdrop"},
+ ]
+ },
}
diff --git a/roles/webserver-alkane/php/cleanup.sls b/roles/webserver-alkane/php/cleanup.sls
--- a/roles/webserver-alkane/php/cleanup.sls
+++ b/roles/webserver-alkane/php/cleanup.sls
@@ -14,7 +14,7 @@
def get_etc_dir():
- if __grains__['os'] == 'FreeBSD':
+ if __grains__["os"] == "FreeBSD":
return "/usr/local/etc"
return "/etc"
@@ -23,10 +23,14 @@
def files_to_delete_if_they_exist():
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"
- for _, site in __pillar__['web_php_sites'].items()
- if site['php-fpm'] != instance])
+ for instance in __pillar__["php_fpm_instances"]:
+ 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
+ ]
+ )
return files

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 5, 09:28 (14 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3595907
Default Alt Text
D4047.diff (4 KB)

Event Timeline

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