Merge pull request #2339 from mdklapwijk-forks/patch-mod-security-unique_id-naming

david22swan · web-flow · commit 1d2302da7328 · 2022-12-05T11:47:38.000Z
remove _module from apache::mod::unique_id name.
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
@@ -200,7 +200,7 @@
     lib => 'mod_security2.so',
   }
 
-  ::apache::mod { 'unique_id_module':
+  ::apache::mod { 'unique_id':
     id  => 'unique_id_module',
     lib => 'mod_unique_id.so',
   }
diff --git a/spec/classes/mod/security_spec.rb b/spec/classes/mod/security_spec.rb
@@ -19,7 +19,7 @@
             )
           }
           it {
-            is_expected.to contain_apache__mod('unique_id_module').with(
+            is_expected.to contain_apache__mod('unique_id').with(
               id: 'unique_id_module',
               lib: 'mod_unique_id.so',
             )
@@ -189,7 +189,7 @@
             )
           }
           it {
-            is_expected.to contain_apache__mod('unique_id_module').with(
+            is_expected.to contain_apache__mod('unique_id').with(
               id: 'unique_id_module',
               lib: 'mod_unique_id.so',
             )

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`)`
`20`	`20`	`}`
`21`	`21`	`it {`
`22`		`- is_expected.to contain_apache__mod('unique_id_module').with(`
	`22`	`+ is_expected.to contain_apache__mod('unique_id').with(`
`23`	`23`	`id: 'unique_id_module',`
`24`	`24`	`lib: 'mod_unique_id.so',`
`25`	`25`	`)`
`@@ -189,7 +189,7 @@`
`189`	`189`	`)`
`190`	`190`	`}`
`191`	`191`	`it {`
`192`		`- is_expected.to contain_apache__mod('unique_id_module').with(`
	`192`	`+ is_expected.to contain_apache__mod('unique_id').with(`
`193`	`193`	`id: 'unique_id_module',`
`194`	`194`	`lib: 'mod_unique_id.so',`
`195`	`195`	`)`