updated docs deployment

modules/python/manifests/init.pp

@@ -20,15 +20,19 @@ class python {
   require common
 
   $deps = ['python3-scipy', 'python3-numpy', 'python3-matplotlib',
-          'python3-pip', 'python-numpy', 'python-scipy', 'python-matplotlib',
+  	   'python-numpy', 'python-scipy', 'python-matplotlib',
           'cython','python2.7','python2.7-dev','python-setuptools',
           'python-cherrypy3','python-decorator','python-requests',
           'python-dateutil','python-tz','python-progressbar','python-psutil',
-          'python-simplejson', 'python-pip']
+          'python-simplejson']
 
   package{$deps:
     ensure => present
   }
+  package{['python-pip', 'python3-pip']:
+    ensure => absent,
+    require => Exec['upgrade_pip3','upgrade_pip2']
+  }
   exec{'upgrade_pip3':
     command => 'pip3 install --upgrade pip',
     path    => ['/usr/local/bin','/usr/bin'],

modules/static_sites/files/20-helpdocs.conf

@@ -3,6 +3,9 @@ NameVirtualHost *:80
   ServerName docs
   ServerAlias docs.wattsworth.local
   DocumentRoot /var/www/docs
+  <Directory /var/www/docs/modules>
+    FallbackResource /modules
+  </Directory>
   <Directory /var/www/docs>
     Options Indexes FollowSymLinks MultiViews
     AllowOverride None

modules/static_sites/manifests/init.pp

@@ -20,12 +20,21 @@ class static_sites {
   # The Angular Frontend Site
   file{'/var/www/frontend':
     ensure  => directory,
-    source  => 'puppet:///modules/static_sites/lumen',
     owner   => root,
     group   => root,
     mode    => '0644',
-    recurse => true
   }
+  $lumen_cmd = "wget http://docs.wattsworth.net/lumen.tar > /dev/null &&\
+              rm -rf /var/www/frontend/* &&\
+	      tar -xf lumen.tar -C /var/www/frontend &&\
+	      rm lumen.tar"
+	      
+  exec{ 'InstallLumen':
+    command => $lumen_cmd,
+    path => ['/bin', '/usr/sbin', '/usr/bin'],
+    require => File['/var/www/frontend']
+  }
+  
   file{'/etc/apache2/sites-available/15-frontend.conf':
     source => 'puppet:///modules/static_sites/15-frontend.conf',
     owner  => root,
@@ -42,13 +51,28 @@ class static_sites {
   # The Help Docs Site
   file{'/var/www/docs':
     ensure  => directory,
-    source  => 'puppet:///modules/static_sites/docs',
     owner   => root,
     group   => root,
     mode    => '0644',
-    recurse => true
+  }
+  $docs_cmd = "wget http://docs.wattsworth.net/docs.tar > /dev/null &&\
+              rm -rf /var/www/docs/* &&\
+	      tar -xf docs.tar -C /var/www/docs &&\
+	      mv /var/www/docs/standalone_index.html /var/www/docs/index.html &&\
+	      rm docs.tar"
+	      
+  exec{ 'InstallDocs':
+    command => $docs_cmd,
+    path => ['/bin', '/usr/sbin', '/usr/bin'],
+    require => File['/var/www/frontend']
   }
 
+  file{ '/var/www/docs/store/data.json':
+    ensure => link,
+    target => '/etc/joule/module_docs.json',
+    require => Exec['InstallDocs']
+  }
+  
   file{'/etc/apache2/sites-available/20-helpdocs.conf':
     source => 'puppet:///modules/static_sites/20-helpdocs.conf',
     owner  => root,