fix amazon linux repo url and auditd disabling

threatstack · Feb 8, 2019 · 7386aa3 · 7386aa3
1 parent 12903cb
commit 7386aa3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/manifests/package.pp b/manifests/package.pp
@@ -21,11 +21,17 @@
   class { $::threatstack::repo_class: }
 
   if $::threatstack::disable_auditd {
-    service { 'auditd':
-      ensure => 'stopped',
-      enable => false
+    exec { 'stop_auditd':
+      command => '/sbin/service auditd stop',
+      onlyif  => '/sbin/service auditd status'
     }
-  $required = [ Class[$::threatstack::repo_class], Service['auditd'] ]
+
+    exec { 'disable_auditd':
+      command => '/bin/systemctl disable auditd',
+      require => Exec['stop_auditd']
+    }
+
+  $required = [ Class[$::threatstack::repo_class], Exec['stop_auditd'] ]
   } else {
     $required = Class[$::threatstack::repo_class]
   }
@@ -37,5 +43,4 @@
     ensure  => $::threatstack::package_version,
     require => $required
   }
-
 }
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -35,7 +35,7 @@
 
       case $facts['os']['name'] {
         'Amazon': {
-              $repo_url       = 'https://pkg.threatstack.com/v2/Amazon'
+              $repo_url       = "https://pkg.threatstack.com/v2/Amazon/${facts['os']['release']['major']}"
               $disable_auditd = true
             }
         /(CentOS|RedHat)/: {