diff options
| author | Georg Pfuetzenreuter | 2023-01-24 23:29:11 +0100 |
|---|---|---|
| committer | Georg Pfuetzenreuter | 2023-01-24 23:29:11 +0100 |
| commit | 7305d708229241791102e044ad145405f5e71423 (patch) | |
| tree | a6bd4d887cbb95f3a1b736880f684b0774646c81 /salt/common | |
| parent | 342affc1b8d8a3c6152de27e809a63e6cc86b043 (diff) | |
| parent | 4bf9ac9413b0ab5668abd9a77c9be745b5bee136 (diff) | |
| download | salt-7305d708229241791102e044ad145405f5e71423.tar.gz salt-7305d708229241791102e044ad145405f5e71423.tar.bz2 salt-7305d708229241791102e044ad145405f5e71423.zip | |
Merge pull request 'Revert OS pillar split' (#4) from revert-ospillarsplit into production
Reviewed-on: https://git.com.de/LibertaCasa/salt/pulls/4
Diffstat (limited to 'salt/common')
| -rw-r--r-- | salt/common/postfix.sls | 3 | ||||
| -rw-r--r-- | salt/common/suse.sls | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/salt/common/postfix.sls b/salt/common/postfix.sls deleted file mode 100644 index d5b51d4..0000000 --- a/salt/common/postfix.sls +++ /dev/null @@ -1,3 +0,0 @@ -include: - - postfix - - postfix.config diff --git a/salt/common/suse.sls b/salt/common/suse.sls index d76da87..d4cd6a1 100644 --- a/salt/common/suse.sls +++ b/salt/common/suse.sls @@ -3,7 +3,7 @@ include: - profile.zypp - profile.node_exporter - users - - .postfix + - role.mta.postfix {#- to-do: move this to some formula or macro -#} {%- set osfullname = grains['osfullname'] -%} |