22 files changed, 8 insertions, 1 deletions

diff --git a/modules/apache b/modules/apache
deleted file mode 160000
-Subproject 42c1b5cae109630a53be89eda10c5c761c6d368
diff --git a/modules/archive b/modules/archive
deleted file mode 160000
-Subproject 9af5cad2bbaafe0498032c38a37835e4ccba7d2
diff --git a/modules/aur/manifests/aura.pp b/modules/aur/manifests/aura.pp
index 3e06f0a..3074885 100644
--- a/modules/aur/manifests/aura.pp
+++ b/modules/aur/manifests/aura.pp
@@ -13,10 +13,14 @@ class aur::aura(
   ensure_packages(['base-devel'], { 'install_options'  => '--needed' })
   ensure_packages(['gmp', 'pcre'], { 'install_options' => '--asdeps' })
 
+  # aur.sh seems down
+  #$aur_url = "https://aur.sh"
+  $aur_url = "https://raw.githubusercontent.com/stuartpb/aur.sh/dc2f3fcaa90a4d3d1e8d746160559b5d3123a425/aur.sh"
+
   exec { 'aur::aura':
     cwd       => "/tmp",
     path      => "/usr/bin",
-    command   => 'curl -o /tmp/aur.sh aur.sh && chmod +x /tmp/aur.sh && /tmp/aur.sh aura-bin && mv /tmp/aura-bin/aura-bin-*-x86_64.pkg.tar.xz /tmp/aura-bin-x86_64.pkg.tar.xz && rm /tmp/aur.sh && rm -rf /tmp/aura-bin',
+    command   => "curl -o /tmp/aur.sh $aur_url && chmod +x /tmp/aur.sh && /tmp/aur.sh aura-bin && mv /tmp/aura-bin/aura-bin-*-x86_64.pkg.tar.xz /tmp/aura-bin-x86_64.pkg.tar.xz && rm /tmp/aur.sh && rm -rf /tmp/aura-bin",
     user      => "aur-builder",
     unless    => '/usr/bin/pacman -Qo aura',
     require   => Package['base-devel'],
diff --git a/modules/base_installation/templates/puppet/puppet.conf.erb b/modules/base_installation/templates/puppet/puppet.conf.erb
index 37eba8e..03b33bb 100644
--- a/modules/base_installation/templates/puppet/puppet.conf.erb
+++ b/modules/base_installation/templates/puppet/puppet.conf.erb
@@ -4,6 +4,9 @@ reports = store,xmpp
 <% else %>
 reports = store
 <% end %>
+
+basemodulepath = <%= @puppet_code_path %>/modules:<%= @puppet_code_path %>/external_modules
+
 ssldir = <%= @puppet_ssl_path %>
 
 environment = <%= @environment %>
diff --git a/modules/concat b/modules/concat
deleted file mode 160000
-Subproject b783e1e99def0bf45a391a2ebce5a39bd4174e1
diff --git a/modules/cron b/modules/cron
deleted file mode 160000
-Subproject d90d9be088ad5008018ada87c30ceb314a46ed7
diff --git a/modules/fail2ban b/modules/fail2ban
deleted file mode 160000
-Subproject c4f816ded7245641ab70d553dc27f635f07614f
diff --git a/modules/inifile b/modules/inifile
deleted file mode 160000
-Subproject e5d624da43c3571e476ddfa4bbfde4acc5800f9
diff --git a/modules/letsencrypt b/modules/letsencrypt
deleted file mode 160000
-Subproject 55ac1e9c731b6dbfc380cd282c39f273223fcd5
diff --git a/modules/logrotate b/modules/logrotate
deleted file mode 160000
-Subproject a528845d7a172c939a70fe369de382cac22e9b5
diff --git a/modules/nodejs b/modules/nodejs
deleted file mode 160000
-Subproject c77134280b7e30f3c8a94448e04de5c238e6c89
diff --git a/modules/pacman b/modules/pacman
deleted file mode 160000
-Subproject 5668cfa6dff56d5965ab2143fd0aeb322518d9c
diff --git a/modules/postgresql b/modules/postgresql
deleted file mode 160000
-Subproject 52ea030ad94397ba0d066c36c3028a255341f9f
diff --git a/modules/reboot b/modules/reboot
deleted file mode 160000
-Subproject 4bb63a6c48c5948e757b1abe561b69772b46e9f
diff --git a/modules/redis b/modules/redis
deleted file mode 160000
-Subproject bfcc2120f7b83342b03241d1429028a6defdd0d
diff --git a/modules/ssh b/modules/ssh
deleted file mode 160000
-Subproject 1c1dc57e12baa1e67913456e3e959b3bdc55164
diff --git a/modules/ssh_keygen b/modules/ssh_keygen
deleted file mode 160000
-Subproject ca53363249b58af96f90cb810c7c51dda8ba803
diff --git a/modules/ssl b/modules/ssl
deleted file mode 160000
-Subproject c1cef11d63da71c7599e905ff0598d21799ab8c
diff --git a/modules/stdlib b/modules/stdlib
deleted file mode 160000
-Subproject 0bb25fb19904e8b346a25204f787b8bdc5140ba
diff --git a/modules/sudo b/modules/sudo
deleted file mode 160000
-Subproject 1338166b0baeed32eed7458f182c955353be9e8
diff --git a/modules/systemd b/modules/systemd
deleted file mode 160000
-Subproject b0a93b8c4fa18f1f2c477c5348e9bccd3bdebd6
diff --git a/modules/xmpp b/modules/xmpp
deleted file mode 160000
-Subproject d18dd07ffdf6c33942bd0c277cb24aafa513cbd