moved pypi to aws

modules/joule/manifests/init.pp

@@ -15,8 +15,8 @@
 class joule {
   require python
 
-  $pip_url='http://puppet:wX27zvbA@pypi.wattsworth.net:8080/'
-  $pip_cmd="pip3 install --upgrade --upgrade-strategy only-if-needed --extra-index-url ${pip_url} --trusted-host pypi.wattsworth.net"
+  $pip_url='https://pypi.wattsworth.net/'
+  $pip_cmd="pip3 install --upgrade-strategy only-if-needed --upgrade --extra-index-url ${pip_url}"
 
   exec{'install_joule':
     command => "${pip_cmd} joule",

modules/nilm/manifests/init.pp

@@ -11,8 +11,8 @@
 #
 class nilm {
   require python
-  $pip_url='http://puppet:wX27zvbA@pypi.wattsworth.net:8080/'
-  $pip_cmd="pip3 install --upgrade-strategy only-if-needed --upgrade --extra-index-url ${pip_url} --trusted-host pypi.wattsworth.net"
+  $pip_url='https://pypi.wattsworth.net/'
+  $pip_cmd="pip3 install --upgrade-strategy only-if-needed --upgrade --extra-index-url ${pip_url}"
 
   package{'libfreetype6-dev':
     ensure => present

modules/nilmdb/manifests/init.pp

@@ -15,8 +15,8 @@ class nilmdb {
   require 'python'
   require 'apache'
 
-  $pip_url='http://puppet:wX27zvbA@pypi.wattsworth.net:8080/'
-  $pip_cmd="pip2 install --upgrade --upgrade-strategy only-if-needed --extra-index-url ${pip_url} --trusted-host pypi.wattsworth.net"
+  $pip_url='https://pypi.wattsworth.net/'
+  $pip_cmd="pip2 install --upgrade --upgrade-strategy only-if-needed --extra-index-url ${pip_url}