Merge pull request #35 from ccin2p3/fix-bootstrap

Fix bootstrapping of syslog-ng
ccin2p3 · Jun 13, 2023 · 4b03553 · 4b03553
2 parents 02c636e + 5610265
commit 4b03553
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -11,7 +11,7 @@
 ) {
 # package
   if $manage_package {
-    if is_string($package_name) {
+    if $package_name =~ String {
       $real_package_name = $package_name
     } else {
       case $facts['os']['family'] {

diff --git a/manifests/simple/ruleset.pp b/manifests/simple/ruleset.pp
@@ -5,7 +5,7 @@
   Array[String[1]] $patterns    = [],
   Array[Patterndb::Rule] $rules = [],
   String[1] $parser             = 'default',
-  Integer $version              = if versioncmp($facts['syslog_ng_version'], '4.0.0') >= 0 {
+  Integer $version              = if versioncmp($facts.get('syslog_ng_version', '3.0.0'), '4.0.0') >= 0 {
     6
   } else {
     4

diff --git a/metadata.json b/metadata.json
@@ -4,7 +4,7 @@
   "author": "ccin2p3",
   "summary": "Puppet module for patterndb (Syslog-ng)",
   "license": "CECILL-B",
-  "source": "git://github.com/ccin2p3/puppet-patterndb.git",
+  "source": "https://github.com/ccin2p3/puppet-patterndb.git",
   "project_page": "https://github.com/ccin2p3/puppet-patterndb",
   "issues_url": "https://github.com/ccin2p3/puppet-patterndb/issues",
   "dependencies": [

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -10,7 +10,7 @@
   install_package(host, 'lsb-release') if fact_on(host, 'os.name') == 'Ubuntu'
 
   install_module_from_forge_on(host, 'ccin2p3/syslog_ng', '>= 0')
-  install_module_from_forge_on(host, 'puppetlabs/apt', '>= 0')
+  install_module_from_forge_on(host, 'puppetlabs/apt', '>= 0 < 9.0.0')
   install_module_from_forge_on(host, 'puppet/epel', '>= 0')
 end