added new documentation files

modules/common/manifests/init.pp

@@ -29,7 +29,7 @@ class common {
     mode => '0644',
     source => 'puppet:///modules/common/chromium_policy.json'
   }
-  # Set up files on the Desktop
+  # Set up files on the Ubuntu Desktop (through /etc/skel)
   if $facts['platform'] == 'ubuntu'{
     file {'/etc/skel/Desktop':
       ensure => directory,
@@ -43,18 +43,39 @@ class common {
       provider => git,
       source   => 'https://github.com/wattsworth/example-modules.git'
     }
-  } else {
+    file{'/etc/skel/Desktop/STORAGE_README':
+      ensure => present,
+      source => 'puppet:///modules/common/STORAGE_README'
+    }
+  }
+  # set up files on Pi (directly to /home/pi)
+  else {
       file { '/etc/profile.d/first_boot.sh':
         ensure => present,
         owner => root,
         group => root,
         mode => '0755',
-        source => 'puppet:///modules/common/first_boot_sh_notify.sh'
+        source => 'puppet:///modules/common/pi/first_boot_sh_notify.sh'
       }
       file {'/home/pi/Desktop/README':
         ensure => present,
+        owner => pi,
+        group => pi,
         source => 'puppet:///modules/common/README'
       }
+      file{'/etc/skel/Desktop/STORAGE_README':
+        ensure => present,
+        owner => pi,
+        group => pi,
+        source => 'puppet:///modules/common/STORAGE_README'
+      }
+      file{'/etc/skel/Desktop/NETWORK_README':
+        ensure => present,
+        owner => pi,
+        group => pi,
+        source => 'puppet:///modules/common/pi/NETWORK_README'
+      }
+
       vcsrepo{'/home/pi/Desktop/example_modules':
         ensure   => latest,
         provider => git,
@@ -65,14 +86,14 @@ class common {
         owner => root,
         group => root,
         mode => '0755',
-        source => 'puppet:///modules/common/autostart_xdg'
+        source => 'puppet:///modules/common/pi/autostart_xdg'
       }
       file {'/usr/local/bin/first_boot_gui_notify':
         ensure => present,
         owner => root,
         group => root,
         mode => '0755',
-        source => 'puppet:///modules/common/first_boot_gui_notify.sh'
+        source => 'puppet:///modules/common/pi/first_boot_gui_notify.sh'
       }
   }
   # first boot initialization scripts

modules/hostapd/manifests/config.pp

 
 class hostapd::config{
   notice("including hostapd config")
-  file {'/etc/hostapd/hostapd.conf':
-    owner => root,
-    group => root,
-    source => 'puppet:///modules/hostapd/pi/hostapd.conf'
+  if $facts['platform'] == 'rpi'{
+    file {'/etc/hostapd/hostapd.conf':
+      owner => root,
+      group => root,
+      source => 'puppet:///modules/hostapd/pi/hostapd.conf'
+    }
+    file {'/etc/dnsmasq.conf':
+      owner => root,
+      group => root,
+      source => 'puppet:///modules/hostapd/pi/dnsmasq.conf'
+    }  
+    file{'/etc/dhcpcd.conf':
+      owner => root,
+      group => root,
+      source => 'puppet:///modules/hostapd/pi/dhcpcd.conf'
+    }
   }
-  file {'/etc/dnsmasq.conf':
-    owner => root,
-    group => root,
-    source => 'puppet:///modules/hostapd/pi/dnsmasq.conf'
-  }
-  file{'/etc/dhcpcd.conf':
-    owner => root,
-    group => root,
-    source => 'puppet:///modules/hostapd/pi/dhcpcd.conf'
-  }    
 }

modules/hostapd/manifests/service.pp

 
 class hostapd::service{
   notice("including hostapd service")
+  # disable both services
   service{'hostapd':
     enable => false,
     ensure => stopped,

site.pp

@@ -4,25 +4,7 @@ node 'default' {
   include joule
   include static_sites
   include rails_api
-#  include joule_labjack
+  include joule_labjack
   include nginx
   include hostapd
 }
-
-node 'nilm'{
-  include joule
-  include nilmdb
-  include nilm
-  include static_sites
-  include rails_api
-  include joule_labjack
-  include nilmplug
-}
-
-node 'rpi'{
-  include joule
-  include timescaledb
-  include static_sites
-  include rails_api
-  include joule_labjack
-}

tests/ww_test_script.sh

@@ -4,7 +4,7 @@ export LC_ALL=C.UTF-8
 export LANG=C.UTF-8
 
 joule admin authorize
-joule master add lumen http://127.0.0.1/lumen
+joule master add lumen 127.0.0.1
 
 #----Module Configs----
 

vagrant/Vagrantfile

@@ -38,7 +38,7 @@ Vagrant.configure("2") do |config|
   # the path on the guest to mount the folder. And the optional third
   # argument is a set of non-required options.
   config.vm.synced_folder "../", "/puppet"
-
+  config.vm.synced_folder "/home/jdonnal/joule", "/joule"
   # Provider-specific configuration so you can fine-tune various
   # backing providers for Vagrant. These expose provider-specific options.
   # Example for VirtualBox: