From 2add65e2ed91fe4865cf6decb83d1270ff1fce8b Mon Sep 17 00:00:00 2001
From: "Z. Cliffe Schreuders" <code.cliffe@schreuders.org>
Date: Sat, 27 Oct 2018 13:51:14 +0100
Subject: [PATCH] networking

---
 lib/helpers/ovirt_affinity.py                 |  2 +
 .../monitoring_ids/snort/manifests/install.pp | 87 ++-----------------
 .../monitoring_ids/snort/manifests/service.pp |  3 -
 .../monitoring_ids/snort/secgen_metadata.xml  |  4 +
 4 files changed, 12 insertions(+), 84 deletions(-)

diff --git a/lib/helpers/ovirt_affinity.py b/lib/helpers/ovirt_affinity.py
index 0dcc570af..2afae74a0 100644
--- a/lib/helpers/ovirt_affinity.py
+++ b/lib/helpers/ovirt_affinity.py
@@ -20,6 +20,7 @@ parser.add_argument("ovirt_url")
 parser.add_argument("ovirt_username")
 parser.add_argument("ovirt_password")
 args = parser.parse_args()
+print(args)
 
 # Create the connection to the server:
 connection = sdk.Connection(
@@ -62,6 +63,7 @@ vms = vms_service.list(search='name=' + args.vm_name_search)
 affinitygroups = cluster_affinitygroups_service.list()
 
 for affinitygroup in affinitygroups:
+    print (affinitygroup.name + '--' + args.affinitygroup)
     if affinitygroup.name == args.affinitygroup:
         print ("Using Affinity_Group: " + affinitygroup.name + " Affinity_Group ID: " + affinitygroup.id)
         group_service = cluster_affinitygroups_service.group_service(affinitygroup.id)
diff --git a/modules/utilities/unix/monitoring_ids/snort/manifests/install.pp b/modules/utilities/unix/monitoring_ids/snort/manifests/install.pp
index 239960848..607440718 100644
--- a/modules/utilities/unix/monitoring_ids/snort/manifests/install.pp
+++ b/modules/utilities/unix/monitoring_ids/snort/manifests/install.pp
@@ -1,89 +1,14 @@
 class snort::install {
 
-  package { ['build-essential','bison', 'zlib1g', 'zlib1g-dev', 'flex', 'libdaq2', 'libdumbnet1', 'snort-common-libraries', 'libpcre3-dev',
-    'libdumbnet-dev']:
-    ensure => installed,
-  }
-
-  Exec { path => ['/bin', '/usr/bin', '/usr/local/bin', '/sbin', '/usr/sbin'] }
-
-  file { '/usr/local/src/libpcap-1.9.0.tar.gz':
-    source => "puppet:///modules/snort/libpcap-1.9.0.tar.gz",
-    ensure => present,
-  }
-
-  file { '/usr/local/src/daq-2.0.6.tar.gz':
-    source => "puppet:///modules/snort/daq-2.0.6.tar.gz",
-    ensure => present,
-  }
-
-  file { '/usr/local/src/snort-2.9.12.tar.gz':
-    source => "puppet:///modules/snort/snort-2.9.12.tar.gz",
-    ensure => present,
-  }
-
-  exec { 'unpack-libpcap':
-    cwd     => '/usr/local/src/',
-    command => 'tar -xzvf libpcap-1.9.0.tar.gz',
-    creates => '/usr/local/src/libpcap-1.9.0/',
-    require => File['/usr/local/src/libpcap-1.9.0.tar.gz'],
-  }
-
-  exec { 'unpack-daq':
-    cwd     => '/usr/local/src/',
-    command => 'tar -xzvf daq-2.0.6.tar.gz',
-    creates => '/usr/local/src/daq-2.0.6/',
-    require => File['/usr/local/src/daq-2.0.6.tar.gz'],
-  }
-
-  exec { 'unpack-snort':
-    cwd     => '/usr/local/src/',
-    command => 'tar -xzvf snort-2.9.12.tar.gz',
-    creates => '/usr/local/src/snort-2.9.12/',
-    require => File['/usr/local/src/snort-2.9.12.tar.gz'],
-  }
-
-  exec { 'install-libpcap':
-    cwd     => '/usr/local/src/libpcap-1.9.0/',
-    command => '/usr/local/src/libpcap-1.9.0/configure --prefix=/usr && sudo make && sudo make install',
-    require => Exec['unpack-libpcap']
-  }
-
-  exec { 'install-daq':
-    cwd     => '/usr/local/src/daq-2.0.6/',
-    command => '/usr/local/src/daq-2.0.6/configure && sudo make && sudo make install',
-    require => Exec['unpack-daq', 'install-libpcap']
-  }
-
-  exec { 'install-snort':
-    cwd     => '/usr/local/src/snort-2.9.12/',
-    command =>
-      '/usr/local/src/snort-2.9.12/configure --enable-sourcefire --disable-open-appid && sudo make && sudo make install'
-    ,
-    require => Exec['unpack-snort', 'install-daq']
-  }
-
-  # Create a service file
-  file { '/lib/systemd/system/snort.service':
-    ensure  => file,
-    content => template('snort/snort.service.erb'),
-  }
-
-  exec { 'snort-reload-daemon':
-    command => 'systemctl daemon-reload',
-    require => [Exec['install-snort'], File['/lib/systemd/system/snort.service']],
-  }
-
   # install rules and config via debian repo
   package { ['snort-rules-default','snort-common']:
     ensure => installed,
-  }
+  } ->
 
-  file{"/var/log/snort":
-    ensure  =>  directory,
-    mode    =>  0755,
-  }
-  file { '/var/log/snort/alert':
-    ensure => present,
+  exec { 'install snort':
+    path     => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ],
+    command  => '/bin/true',
+    provider => shell,
+    onlyif   => 'apt-get install -y snort; systemctl disable snort',
   }
 }
diff --git a/modules/utilities/unix/monitoring_ids/snort/manifests/service.pp b/modules/utilities/unix/monitoring_ids/snort/manifests/service.pp
index c69141871..3a9094922 100644
--- a/modules/utilities/unix/monitoring_ids/snort/manifests/service.pp
+++ b/modules/utilities/unix/monitoring_ids/snort/manifests/service.pp
@@ -1,5 +1,2 @@
 class snort::service{
- service { 'snort':
-   ensure => running,
- }
 }
diff --git a/modules/utilities/unix/monitoring_ids/snort/secgen_metadata.xml b/modules/utilities/unix/monitoring_ids/snort/secgen_metadata.xml
index 660b53e74..967d52c51 100644
--- a/modules/utilities/unix/monitoring_ids/snort/secgen_metadata.xml
+++ b/modules/utilities/unix/monitoring_ids/snort/secgen_metadata.xml
@@ -13,4 +13,8 @@
 
   <!--TODO: Need to add configuration to use with Stretch as default config uses eth0 style interface naming -->
 
+  <requires>
+    <type>update</type>
+  </requires>
+
 </utility>