Merge pull request #37 from jordiprats/master

0.3.7
NTTCom-MS · Oct 10, 2019 · 549c95b · 549c95b
2 parents 383a2dc + 68d2ac7
commit 549c95b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.3.7
+
+* added support for **RHEL 8**
+
 ## 0.3.6
 
 * added **IPv6** settings:
@@ -10,19 +14,19 @@
 
 ## 0.3.5
 
-* added support for SLES 11.4
+* added support for **SLES 11.4**
 
 ## 0.3.4
 
 * added **manage_config_file** flag
 
 ## 0.3.3
 
-* added support for SLES 11.3
+* added support for **SLES 11.3**
 
 ## 0.3.2
 
-* added support for SLES 12.3
+* added support for **SLES 12.3**
 
 ## 0.3.1
 

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -12,7 +12,7 @@
           $sysctlreload='sysctl -e -p'
           $randomize_va_space_default='2'
         }
-        /^7.*$/:
+        /^[7-8].*$/:
         {
           $execshield_default=undef
           $sysctlreload='sysctl -e --system'

diff --git a/manifests/set.pp b/manifests/set.pp
@@ -2,16 +2,14 @@
                     $value,
                     $setting   = $name,
                     $permanent = true,
-                    $order     = '59',
+                    $order     = '42',
                     $enable    = true,
                   ) {
 
   Exec{
     path => '/usr/sbin:/usr/bin:/sbin:/bin',
   }
 
-  validate_integer($order, 99, 59)
-
   if($enable)
   {
     include ::sysctl
@@ -30,7 +28,7 @@
       concat::fragment{ "sysctl ${setting} ${name}":
         target  => '/etc/sysctl.conf',
         content => "${setting}=${value}\n",
-        order   => $order,
+        order   => "59-${order}",
       }
     }
 

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "eyp-sysctl",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "author": "eyp",
   "summary": "configure and manage sysctl",
   "license": "Apache-2.0",
@@ -15,19 +15,19 @@
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
-      "operatingsystemrelease": [ "5", "6", "7" ]
+      "operatingsystemrelease": [ "5", "6", "7", "8" ]
     },
     {
       "operatingsystem": "CentOS",
-      "operatingsystemrelease": [ "5", "6", "7" ]
+      "operatingsystemrelease": [ "5", "6", "7", "8" ]
     },
     {
       "operatingsystem": "Scientific",
-      "operatingsystemrelease": [ "5", "6", "7" ]
+      "operatingsystemrelease": [ "5", "6", "7", "8" ]
     },
     {
       "operatingsystem": "OEL",
-      "operatingsystemrelease": [ "5", "6", "7" ]
+      "operatingsystemrelease": [ "5", "6", "7", "8" ]
     },
     {
       "operatingsystem": "Ubuntu",