Page MenuHomeDevCentral
Files F3744366

D2633.diff
No OneTemporary
Actions

D2633.diff
View Options

diff --git a/roles/core/network/routes.sls b/roles/core/network/routes.sls
--- a/roles/core/network/routes.sls
+++ b/roles/core/network/routes.sls
@@ -28,7 +28,7 @@
/usr/sbin/routes:
file.managed:
- source: salt://roles/core/network/files/Linux/routes.sh
- - mode: 0755
+ - mode: 755
/etc/systemd/system/routes.service:
file.managed:
diff --git a/roles/core/rc/init.sls b/roles/core/rc/init.sls
--- a/roles/core/rc/init.sls
+++ b/roles/core/rc/init.sls
@@ -17,7 +17,7 @@
file.managed:
- name : /etc/rc.local
- source: salt://roles/core/rc/files/rc.local.sh
- - mode: 0755
+ - mode: 755
{% endif %}
# -------------------------------------------------------------
diff --git a/roles/core/users/init.sls b/roles/core/users/init.sls
--- a/roles/core/users/init.sls
+++ b/roles/core/users/init.sls
@@ -78,7 +78,7 @@
file.directory:
- user: {{ username }}
- group: {{ username }}
- - dir_mode: 0700
+ - dir_mode: 700
- require:
- user: {{ username }}
diff --git a/roles/devserver/userland-home/homefiles.sls b/roles/devserver/userland-home/homefiles.sls
--- a/roles/devserver/userland-home/homefiles.sls
+++ b/roles/devserver/userland-home/homefiles.sls
@@ -29,7 +29,7 @@
- source: salt://roles/devserver/userland-home/files/_tasks/nanotab.sh
- user: {{ username }}
- group: {{ username }}
- - mode: 0755
+ - mode: 755
/home/{{ username }}/.config/nano/nanorc-tab:
nano.config_autogenerated:
diff --git a/roles/devserver/userland-software/dev.sls b/roles/devserver/userland-software/dev.sls
--- a/roles/devserver/userland-software/dev.sls
+++ b/roles/devserver/userland-software/dev.sls
@@ -111,7 +111,7 @@
{{ dirs.bin }}/rustup-init:
file.managed:
- source: salt://roles/devserver/userland-software/files/rustup-init.sh
- - mode: 0755
+ - mode: 755
# -------------------------------------------------------------
# Shell
diff --git a/roles/freebsd-repo/signing-key/init.sls b/roles/freebsd-repo/signing-key/init.sls
--- a/roles/freebsd-repo/signing-key/init.sls
+++ b/roles/freebsd-repo/signing-key/init.sls
@@ -37,5 +37,5 @@
{{ repo.signing_key_dir }}/repo.key:
file.managed:
- replace: False
- - mode: 0400
+ - mode: 400
- user: builder
diff --git a/roles/opensearch/dashboards/config.sls b/roles/opensearch/dashboards/config.sls
--- a/roles/opensearch/dashboards/config.sls
+++ b/roles/opensearch/dashboards/config.sls
@@ -15,7 +15,7 @@
- source: salt://roles/opensearch/dashboards/files/opensearch_dashboards.yml.jinja
- user: opensearch
- group: opensearch
- - mode: 0600
+ - mode: 600
- template: jinja
- context:
config: {{ config }}
diff --git a/roles/opensearch/dashboards/service.sls b/roles/opensearch/dashboards/service.sls
--- a/roles/opensearch/dashboards/service.sls
+++ b/roles/opensearch/dashboards/service.sls
@@ -21,7 +21,7 @@
file.managed:
- name: /etc/systemd/system/dashboards.service
- source: salt://roles/opensearch/dashboards/files/dashboards.service
- - mode: 0644
+ - mode: 644
service.running:
- name: dashboards
- enable: true
diff --git a/roles/opensearch/opensearch/config.sls b/roles/opensearch/opensearch/config.sls
--- a/roles/opensearch/opensearch/config.sls
+++ b/roles/opensearch/opensearch/config.sls
@@ -47,7 +47,7 @@
/opt/tlstool:
file.directory:
- - mode: 0700
+ - mode: 700
archive.extracted:
- source: /usr/local/dl/search-guard-tlstool.zip
- enforce_toplevel: False
diff --git a/roles/opensearch/opensearch/security.sls b/roles/opensearch/opensearch/security.sls
--- a/roles/opensearch/opensearch/security.sls
+++ b/roles/opensearch/opensearch/security.sls
@@ -16,7 +16,7 @@
- source: salt://roles/opensearch/opensearch/files/internal_users.yml.jinja
- user: opensearch
- group: opensearch
- - mode: 0600
+ - mode: 600
- template: jinja
- context:
users:
diff --git a/roles/opensearch/opensearch/service.sls b/roles/opensearch/opensearch/service.sls
--- a/roles/opensearch/opensearch/service.sls
+++ b/roles/opensearch/opensearch/service.sls
@@ -21,7 +21,7 @@
file.managed:
- name: /etc/systemd/system/opensearch.service
- source: salt://roles/opensearch/opensearch/files/opensearch.service
- - mode: 0644
+ - mode: 644
service.running:
- name: opensearch
- enable: true
diff --git a/roles/opensearch/opensearch/software.sls b/roles/opensearch/opensearch/software.sls
--- a/roles/opensearch/opensearch/software.sls
+++ b/roles/opensearch/opensearch/software.sls
@@ -61,7 +61,7 @@
/opt/opensearch/plugins/opensearch-security/tools/hash.sh:
file.managed:
- - mode: 0755
+ - mode: 755
# -------------------------------------------------------------
# Cleanup legacy versions
diff --git a/roles/opensearch/opensearch/wrapper.sls b/roles/opensearch/opensearch/wrapper.sls
--- a/roles/opensearch/opensearch/wrapper.sls
+++ b/roles/opensearch/opensearch/wrapper.sls
@@ -17,7 +17,7 @@
/usr/local/bin/es-query:
file.managed:
- source: salt://roles/opensearch/opensearch/files/es-query.sh.jinja
- - mode: 0755
+ - mode: 755
- template: jinja
- context:
url: https://{{ config['network_host'] }}:9200
@@ -25,7 +25,7 @@
/root/.opensearch-account:
file.managed:
- source: salt://roles/opensearch/opensearch/files/account.conf
- - mode: 0600
+ - mode: 600
- template: jinja
- context:
username: {{ salt['zr.get_username'](config['users']['admin']) }}
diff --git a/roles/paas-docker/monitoring/init.sls b/roles/paas-docker/monitoring/init.sls
--- a/roles/paas-docker/monitoring/init.sls
+++ b/roles/paas-docker/monitoring/init.sls
@@ -60,7 +60,7 @@
file.managed:
- source: salt://roles/paas-docker/monitoring/files/checks.yml.jinja
- makedirs: True
- - mode: 0644
+ - mode: 644
- template: jinja
- context:
checks:
diff --git a/roles/shellserver/odderon/service.sls b/roles/shellserver/odderon/service.sls
--- a/roles/shellserver/odderon/service.sls
+++ b/roles/shellserver/odderon/service.sls
@@ -19,7 +19,7 @@
file.managed:
- name: /etc/systemd/system/odderon.service
- source: salt://roles/shellserver/odderon/files/odderon.service
- - mode: 0644
+ - mode: 644
module.run:
- service.force_reload:
- name: odderon
diff --git a/roles/webserver-core/letsencrypt/service.sls b/roles/webserver-core/letsencrypt/service.sls
--- a/roles/webserver-core/letsencrypt/service.sls
+++ b/roles/webserver-core/letsencrypt/service.sls
@@ -16,7 +16,7 @@
/usr/local/sbin/letsencrypt-renewal:
file.managed:
- source: salt://roles/webserver-core/letsencrypt/files/letsencrypt-renewal.sh
- - mode: 0755
+ - mode: 755
# -------------------------------------------------------------
# Unit configuration
@@ -28,7 +28,7 @@
file.managed:
- name: /etc/systemd/system/letsencrypt-renew.service
- source: salt://roles/webserver-core/letsencrypt/files/letsencrypt-renew.service
- - mode: 0644
+ - mode: 644
module.run:
- service.force_reload:
- name: letsencrypt-renew
diff --git a/roles/webserver-legacy/php-sites/php.sls b/roles/webserver-legacy/php-sites/php.sls
--- a/roles/webserver-legacy/php-sites/php.sls
+++ b/roles/webserver-legacy/php-sites/php.sls
@@ -38,6 +38,6 @@
{% for fqdn, site in pillar['web_php_sites'].items() %}
/var/tmp/php/sessions/{{ fqdn }}:
file.directory:
- - mode: 0700
+ - mode: 700
- user: {{ site['user'] }}
{% endfor %}

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 16, 04:51 (20 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2247126
Default Alt Text
D2633.diff (7 KB)

Event Timeline

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