bug fixes

modules/common/manifests/init.pp

@@ -3,7 +3,7 @@
 # Packages required by multiple modules
 # Packages required by multiple modules
 #
 #
 class common {
 class common {
-  $pkgs=['build-essential']
+  $pkgs=['build-essential','screen']
   
   
   package { $pkgs:
   package { $pkgs:
     ensure => present
     ensure => present

modules/joule/manifests/init.pp

@@ -14,7 +14,7 @@
 
 
 class joule {
 class joule {
   $pip_url="http://puppet:wX27zvbA@pypi.wattsworth.net:8080/"
   $pip_url="http://puppet:wX27zvbA@pypi.wattsworth.net:8080/"
-  $pip_cmd="pip3 install --extra-index-url ${pip_url} --trusted-host pypi.wattsworth.net"
+  $pip_cmd="pip3 install --upgrade --extra-index-url ${pip_url} --trusted-host pypi.wattsworth.net"
 
 
 
 
   $deps = ['libblas-dev', 'liblapack-dev', 'gfortran']
   $deps = ['libblas-dev', 'liblapack-dev', 'gfortran']

modules/nilm/manifests/init.pp

@@ -11,22 +11,21 @@
 #
 #
 class nilm {
 class nilm {
   $pip_url="http://puppet:wX27zvbA@pypi.wattsworth.net:8080/"
   $pip_url="http://puppet:wX27zvbA@pypi.wattsworth.net:8080/"
-  $pip_cmd="pip3 install --extra-index-url ${pip_url} --trusted-host pypi.wattsworth.net"
+  $pip_cmd="pip3 install --upgrade --extra-index-url ${pip_url} --trusted-host pypi.wattsworth.net"
   
   
+  package{"libfreetype6-dev":
+    ensure => present
+  }
   exec{'install_nilm':
   exec{'install_nilm':
     command => "${pip_cmd} nilm",
     command => "${pip_cmd} nilm",
     timeout => 0,
     timeout => 0,
-    path => ["/usr/local/bin","/usr/bin"]
+    path => ["/usr/local/bin","/usr/bin"],
+    require => Package["libfreetype6-dev"]
   }
   }
   file{'/opt/configs':
   file{'/opt/configs':
     ensure => directory,
     ensure => directory,
-    owner => root,
-    group => root
-  }
-  file{'/opt/configs/meters.example.yml':
-    owner => root,
-    group => root,
-    source => 'puppet:///modules/nilm/meters.yml'
+    #owner => root,
+    #group => root
   }
   }
   file{'/usr/local/bin/ethstream':
   file{'/usr/local/bin/ethstream':
     owner => root,
     owner => root,
@@ -34,4 +33,11 @@ class nilm {
     mode => 0755,
     mode => 0755,
     source => 'puppet:///modules/nilm/ethstream'
     source => 'puppet:///modules/nilm/ethstream'
   }
   }
+  exec{'initialize_nilm':
+    command => "nilm initialize",
+    path => ["/usr/local/bin","/usr/sbin","/bin"],
+    creates => "/opt/configs/meters.example.yml",
+    require => Exec['install_nilm']
+  }
+
 }
 }