Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support of TOFS #13

Merged
merged 2 commits into from
Oct 5, 2019
Merged

Add support of TOFS #13

merged 2 commits into from
Oct 5, 2019

Conversation

n-rodriguez
Copy link
Member

No description provided.

Verified

This commit was signed with the committer’s verified signature.
markgov Mark Roberts
Copy link
Member

@aboe76 aboe76 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice Work @n-rodriguez

@myii
Copy link
Member

myii commented Oct 5, 2019

Diff before and after (map and file.managed x1):

@@ -1,13 +1,25 @@
-https://travis-ci.org/myii/exim-formula/jobs/593914331#L1263-L1285
+https://travis-ci.org/myii/exim-formula/jobs/593914361#L1263-L1298
        [DEBUG   ] Map   : .../exim-formula/.kitchen/yaml_dump/Debian-10-2019.2.0-n/a-e683178-py3.yaml
        aliases:
          root: root@bar.baz
        arch: amd64
        config:
+         cfilemode: '644'
          configtype: satellite
          hide_mailname: 'false'
+         local_interfaces: ''
+         localdelivery: mail_spool
+         minimaldns: 'false'
+         other_hostnames: ''
+         readhost: ''
+         relay_domains: ''
+         relay_nets: ''
+         smarthost: ''
+         ue4c_keepcomments: 'true'
+         use_split_config: 'true'
        config_dir: /etc/exim4
        config_file: update-exim4.conf.conf
+       files: {}
        mailname: foo.bar.baz
        mailname_file: /etc/mailname
        pkgs:
@@ -21,23 +33,15 @@
        - retry
        - rewrite
        - auth
+       virtual_aliases: {}
        virtual_aliases_dir: /etc/exim4/virtual
 
 
-https://travis-ci.org/myii/exim-formula/jobs/593914331#L1425-L1440
+https://travis-ci.org/myii/exim-formula/jobs/593914361#L1450-L1456
-       /etc/exim4/update-exim4.conf.conf:
+       exim/config/install:
          file.managed:
-           - contents: |
-        dc_eximconfig_configtype='satellite'
-        dc_other_hostnames=''
-        dc_local_interfaces=''
-        dc_relay_domains=''
-        dc_relay_nets=''
-        dc_use_split_config='true'
-        dc_hide_mailname='false'
-        ue4c_keepcomments='true'
-        dc_localdelivery='mail_spool'
-        dc_minimaldns='false'
-        dc_readhost=''
-        dc_smarthost=''
-        CFILEMODE='644'
+           - name: /etc/exim4/update-exim4.conf.conf
+           - source: 
+             - salt://exim/files/7bdbc125c90f/update-exim4.conf.conf
+             - salt://exim/files/Debian/update-exim4.conf.conf
+             - salt://exim/files/default/update-exim4.conf.conf
  • All looks good.

myii added a commit to myii/ssf-formula that referenced this pull request Oct 5, 2019
Copy link
Member

@myii myii left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor change, I'll probably make it and get this merged.


@myii
Copy link
Member

myii commented Oct 5, 2019

Lovely work again, @n-rodriguez! Thanks for all of your efforts across all formulas recently. I'll merge this as soon as the tests pass.

@myii myii merged commit 7f04116 into saltstack-formulas:master Oct 5, 2019
@myii
Copy link
Member

myii commented Oct 5, 2019

@n-rodriguez Done.

@saltstack-formulas-travis

🎉 This PR is included in version 0.5.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants