Skip to content

Commit

Permalink
(SIMP-4652) Set init script perms back to RPM defaults (#53)
Browse files Browse the repository at this point in the history
* (SIMP-4652) Set init script perms back to RPM defaults

- Set init script permissions back to the RPM defaults of 0755

SIMP-4652 #comment iptables fixed

* clean fixtures before run
  • Loading branch information
Nick Miller authored and jeannegreulich committed Jun 20, 2018
1 parent 5cff2c8 commit f889bc8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ default:
variables:
PUPPET_VERSION: '4.10'
script:
- bundle exec rake spec_clean
- bundle exec rake beaker:suites[default]

oel:
Expand All @@ -208,6 +209,7 @@ oel:
variables:
PUPPET_VERSION: '4.10'
script:
- bundle exec rake spec_clean
- bundle exec rake beaker:suites[default,oel]

puppet5:
Expand All @@ -220,6 +222,7 @@ puppet5:
PUPPET_VERSION: '5.0'
BEAKER_PUPPET_COLLECTION: 'puppet5'
script:
- bundle exec rake spec_clean
- bundle exec rake beaker:suites[default]

default-fips:
Expand All @@ -232,4 +235,5 @@ default-fips:
PUPPET_VERSION: '4.10'
BEAKER_fips: 'yes'
script:
- bundle exec rake spec_clean
- bundle exec rake beaker:suites[default]
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
* Thu May 17 2018 Trevor Vaughan <tvaughan@onyxpoint.com> - 6.1.5
- Perform deep rule comparison on rulesets that are otherwise identical
- Remove chances for memory leaks due to the design of iptables_rule
- Set init script permissions back to the RPM defaults of 0755

* Thu May 03 2018 Trevor Vaughan <tvaughan@onyxpoint.com> - 6.1.4
- Remove erroneous native IPTables jump point retention
Expand Down
4 changes: 2 additions & 2 deletions manifests/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
ensure => 'file',
owner => 'root',
group => 'root',
mode => '0744',
mode => '0755',
content => file("${module_name}/iptables"),
seltype => 'iptables_initrc_exec_t'
}
Expand All @@ -41,7 +41,7 @@
ensure => 'file',
owner => 'root',
group => 'root',
mode => '0744',
mode => '0755',
seltype => 'iptables_initrc_exec_t',
content => file("${module_name}/ip6tables")
}
Expand Down

0 comments on commit f889bc8

Please sign in to comment.