patch-cumuluslinux-support (#239)

mdklapwijk · web-flow · commit ef6014d11859 · 2020-06-01T10:04:41.000+02:00
Signed-off-by: mdklapwijk &lt;m.d.klapwijk@linuxvoid.org&gt;
diff --git a/manifests/grub.pp b/manifests/grub.pp
@@ -17,7 +17,7 @@
 ) {
 
   case $::operatingsystem {
-    debian, ubuntu: {
+    debian, ubuntu, cumuluslinux: {
       $grub_cfg = '/boot/grub/grub.cfg'
       $grub_cmd = '/usr/sbin/grub-mkconfig'
     }
diff --git a/manifests/minimize_access.pp b/manifests/minimize_access.pp
@@ -33,7 +33,7 @@
       $nologin_path = '/sbin/nologin'
       $shadow_path = ['/etc/shadow', '/etc/gshadow']
     }
-    debian, ubuntu: {
+    debian, ubuntu, cumuluslinux: {
       $nologin_path = '/usr/sbin/nologin'
       $shadow_path = ['/etc/shadow', '/etc/gshadow']
     }
diff --git a/manifests/pam.pp b/manifests/pam.pp
@@ -27,7 +27,7 @@
       $pam_passwdqc = 'pam_passwdqc'
       $pam_cracklib = 'pam_cracklib'
     }
-    debian, ubuntu: {
+    debian, ubuntu, cumuluslinux: {
       $pam_ccreds = 'libpam-ccreds'
       $pam_passwdqc = 'libpam-passwdqc'
       $pam_cracklib = 'libpam-cracklib'
@@ -46,7 +46,7 @@
   }
 
   case $::operatingsystem {
-    debian, ubuntu: {
+    debian, ubuntu, cumuluslinux: {
       # configure paths
       $passwdqc_path = '/usr/share/pam-configs/passwdqc'
       $tally2_path   = '/usr/share/pam-configs/tally2'
diff --git a/manifests/sysctl.pp b/manifests/sysctl.pp
@@ -206,7 +206,7 @@
   # be pre-configured in initramfs
   if $enable_module_loading == false {
     case $::operatingsystem {
-      debian, ubuntu: {
+      debian, ubuntu, cumuluslinux: {
         file { '/etc/initramfs-tools/modules':
           ensure  => file,
           content => template('os_hardening/modules.erb'),
diff --git a/metadata.json b/metadata.json
@@ -70,6 +70,13 @@
         "16",
         "18"
       ]
+    },
+    {
+      "operatingsystem": "CumulusLinux",
+      "operatingsystemrelease": [
+        "3",
+        "4"
+      ]
     }
   ],
   "requirements": [

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`) {`
`18`	`18`
`19`	`19`	`case $::operatingsystem {`
`20`		`- debian, ubuntu: {`
	`20`	`+ debian, ubuntu, cumuluslinux: {`
`21`	`21`	`$grub_cfg = '/boot/grub/grub.cfg'`
`22`	`22`	`$grub_cmd = '/usr/sbin/grub-mkconfig'`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`$nologin_path = '/sbin/nologin'`
`34`	`34`	`$shadow_path = ['/etc/shadow', '/etc/gshadow']`
`35`	`35`	`}`
`36`		`- debian, ubuntu: {`
	`36`	`+ debian, ubuntu, cumuluslinux: {`
`37`	`37`	`$nologin_path = '/usr/sbin/nologin'`
`38`	`38`	`$shadow_path = ['/etc/shadow', '/etc/gshadow']`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,13 @@`
`70`	`70`	`"16",`
`71`	`71`	`"18"`
`72`	`72`	`]`
	`73`	`+ },`
	`74`	`+ {`
	`75`	`+ "operatingsystem": "CumulusLinux",`
	`76`	`+ "operatingsystemrelease": [`
	`77`	`+ "3",`
	`78`	`+ "4"`
	`79`	`+ ]`
`73`	`80`	`}`
`74`	`81`	`],`
`75`	`82`	`"requirements": [`