Merge pull request #26 from mherrre/master

Addapted restrict defaults to match CaaS
NTTCom-MS · Mar 28, 2022 · 8f10e85 · 8f10e85
2 parents db30683 + f4b0cec
commit 8f10e85
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.1.18
+
+* Addapted restrict defaults to match CaaS
+
 ## 0.1.17
 
 * Added support for **Ubuntu 20.04**

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -24,16 +24,16 @@
       $restrict_ipv4_default = [
                                 'default',
                                 'kod',
-                                'notrap',
                                 'nomodify',
+                                'notrap',
                                 'nopeer',
                                 'noquery',
                               ]
       $restrict_ipv6_default = [
                                 'default',
                                 'kod',
-                                'notrap',
                                 'nomodify',
+                                'notrap',
                                 'nopeer',
                                 'noquery',
                               ]
@@ -99,16 +99,16 @@
               $restrict_ipv4_default = [
                                         'default',
                                         'kod',
-                                        'notrap',
                                         'nomodify',
+                                        'notrap',
                                         'nopeer',
                                         'noquery',
                                       ]
               $restrict_ipv6_default = [
                                         'default',
                                         'kod',
-                                        'notrap',
                                         'nomodify',
+                                        'notrap',
                                         'nopeer',
                                         'noquery',
                                       ]
@@ -119,20 +119,18 @@
               $restrict_ipv4_default = [
                                         'default',
                                         'kod',
-                                        'notrap',
                                         'nomodify',
+                                        'notrap',
                                         'nopeer',
-                                        'noquery',
-                                        'limited',
+                                        'noquery',                                 
                                       ]
               $restrict_ipv6_default = [
                                         'default',
                                         'kod',
-                                        'notrap',
                                         'nomodify',
+                                        'notrap',
                                         'nopeer',
                                         'noquery',
-                                        'limited',
                                       ]
             }
             /^18.*$|20.*$/:
@@ -141,20 +139,18 @@
               $restrict_ipv4_default = [
                                         'default',
                                         'kod',
-                                        'notrap',
                                         'nomodify',
+                                        'notrap',
                                         'nopeer',
                                         'noquery',
-                                        'limited',
                                       ]
               $restrict_ipv6_default = [
                                         'default',
                                         'kod',
-                                        'notrap',
                                         'nomodify',
+                                        'notrap',
                                         'nopeer',
                                         'noquery',
-                                        'limited',
                                       ]
             }
             default: { fail("Unsupported Ubuntu version! - ${::operatingsystemrelease}")  }
@@ -176,16 +172,16 @@
           $restrict_ipv4_default = [
                                     'default',
                                     'kod',
-                                    'notrap',
                                     'nomodify',
+                                    'notrap',
                                     'nopeer',
                                     'noquery',
                                   ]
           $restrict_ipv6_default = [
                                     'default',
                                     'kod',
-                                    'notrap',
                                     'nomodify',
+                                    'notrap',
                                     'nopeer',
                                     'noquery',
                                   ]

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "eyp-ntp",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "author": "eyp",
   "summary": "Installs, configures, and manages the NTP service",
   "license": "Apache-2.0",