Merge branch 'dev'

24 files changed, 30 insertions, 23 deletions

diff --git a/.gitmodules b/.gitmodules
index c75f803..357cc1d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,63 +1,63 @@
 [submodule "modules/stdlib"]
-        path = modules/stdlib
+        path = external_modules/stdlib
         url = git://git.immae.eu/github/puppetlabs/puppetlabs-stdlib.git
 [submodule "modules/reboot"]
-        path = modules/reboot
+        path = external_modules/reboot
         url = git://git.immae.eu/github/puppetlabs/puppetlabs-reboot.git
 [submodule "modules/systemd"]
-        path = modules/systemd
+        path = external_modules/systemd
         url = git://git.immae.eu/github/jkroepke/puppet-systemd.git
 [submodule "modules/inifile"]
-        path = modules/inifile
+        path = external_modules/inifile
         url = git://git.immae.eu/github/puppetlabs/puppetlabs-inifile.git
 [submodule "modules/sudo"]
-        path = modules/sudo
+        path = external_modules/sudo
         url = git://git.immae.eu/github/saz/puppet-sudo.git
 [submodule "modules/ssh"]
-        path = modules/ssh
+        path = external_modules/ssh
         url = git://git.immae.eu/github/saz/puppet-ssh.git
 [submodule "modules/concat"]
-        path = modules/concat
+        path = external_modules/concat
         url = git://git.immae.eu/github/puppetlabs/puppetlabs-concat.git
 [submodule "modules/fail2ban"]
-        path = modules/fail2ban
+        path = external_modules/fail2ban
         url = git://git.immae.eu/github/lelutin/puppet-fail2ban
 [submodule "modules/logrotate"]
-        path = modules/logrotate
+        path = external_modules/logrotate
         url = git://git.immae.eu/github/yo61/puppet-logrotate.git
 [submodule "modules/pacman"]
-        path = modules/pacman
+        path = external_modules/pacman
         url = git://git.immae.eu/github/aboe76/puppet-pacman
 [submodule "modules/postgresql"]
-        path = modules/postgresql
+        path = external_modules/postgresql
         url = git://git.immae.eu/github/puppetlabs/puppetlabs-postgresql.git
 [submodule "modules/archive"]
-        path = modules/archive
+        path = external_modules/archive
         url = git://git.immae.eu/github/voxpupuli/puppet-archive.git
 [submodule "modules/apache"]
-        path = modules/apache
+        path = external_modules/apache
         url = git://git.immae.eu/github/puppetlabs/puppetlabs-apache.git
 [submodule "modules/letsencrypt"]
-        path = modules/letsencrypt
+        path = external_modules/letsencrypt
         url = git://git.immae.eu/github/voxpupuli/puppet-letsencrypt.git
 [submodule "modules/nodejs"]
-        path = modules/nodejs
+        path = external_modules/nodejs
         url = git://git.immae.eu/github/voxpupuli/puppet-nodejs
 [submodule "python/ovh"]
         path = python/ovh
         url = git://git.immae.eu/github/ovh/python-ovh
 [submodule "modules/ssh_keygen"]
-        path = modules/ssh_keygen
+        path = external_modules/ssh_keygen
         url = git://git.immae.eu/github/voxpupuli/puppet-ssh_keygen
 [submodule "modules/xmpp"]
-        path = modules/xmpp
+        path = external_modules/xmpp
         url = git://git.immae.eu/github/jamtur01/puppet-xmpp
 [submodule "modules/ssl"]
-        path = modules/ssl
+        path = external_modules/ssl
         url = git://git.immae.eu/github/fnerdwq/puppet-ssl
 [submodule "modules/cron"]
-        path = modules/cron
+        path = external_modules/cron
         url = git://git.immae.eu/github/voxpupuli/puppet-cron
 [submodule "modules/redis"]
-        path = modules/redis
+        path = external_modules/redis
         url = git://git.immae.eu/github/arioch/puppet-redis
diff --git a/modules/apache b/external_modules/apache
-Subproject 42c1b5cae109630a53be89eda10c5c761c6d368
+Subproject 42c1b5cae109630a53be89eda10c5c761c6d368
diff --git a/modules/archive b/external_modules/archive
-Subproject 9af5cad2bbaafe0498032c38a37835e4ccba7d2
+Subproject 9af5cad2bbaafe0498032c38a37835e4ccba7d2
diff --git a/modules/concat b/external_modules/concat
-Subproject b783e1e99def0bf45a391a2ebce5a39bd4174e1
+Subproject b783e1e99def0bf45a391a2ebce5a39bd4174e1
diff --git a/modules/cron b/external_modules/cron
-Subproject d90d9be088ad5008018ada87c30ceb314a46ed7
+Subproject d90d9be088ad5008018ada87c30ceb314a46ed7
diff --git a/modules/fail2ban b/external_modules/fail2ban
-Subproject c4f816ded7245641ab70d553dc27f635f07614f
+Subproject c4f816ded7245641ab70d553dc27f635f07614f
diff --git a/modules/inifile b/external_modules/inifile
-Subproject e5d624da43c3571e476ddfa4bbfde4acc5800f9
+Subproject e5d624da43c3571e476ddfa4bbfde4acc5800f9
diff --git a/modules/letsencrypt b/external_modules/letsencrypt
-Subproject 55ac1e9c731b6dbfc380cd282c39f273223fcd5
+Subproject 55ac1e9c731b6dbfc380cd282c39f273223fcd5
diff --git a/modules/logrotate b/external_modules/logrotate
-Subproject a528845d7a172c939a70fe369de382cac22e9b5
+Subproject a528845d7a172c939a70fe369de382cac22e9b5
diff --git a/modules/nodejs b/external_modules/nodejs
-Subproject c77134280b7e30f3c8a94448e04de5c238e6c89
+Subproject c77134280b7e30f3c8a94448e04de5c238e6c89
diff --git a/modules/pacman b/external_modules/pacman
-Subproject 5668cfa6dff56d5965ab2143fd0aeb322518d9c
+Subproject 5668cfa6dff56d5965ab2143fd0aeb322518d9c
diff --git a/modules/postgresql b/external_modules/postgresql
-Subproject 52ea030ad94397ba0d066c36c3028a255341f9f
+Subproject 52ea030ad94397ba0d066c36c3028a255341f9f
diff --git a/modules/reboot b/external_modules/reboot
-Subproject 4bb63a6c48c5948e757b1abe561b69772b46e9f
+Subproject 4bb63a6c48c5948e757b1abe561b69772b46e9f
diff --git a/modules/redis b/external_modules/redis
-Subproject bfcc2120f7b83342b03241d1429028a6defdd0d
+Subproject bfcc2120f7b83342b03241d1429028a6defdd0d
diff --git a/modules/ssh b/external_modules/ssh
-Subproject 1c1dc57e12baa1e67913456e3e959b3bdc55164
+Subproject 1c1dc57e12baa1e67913456e3e959b3bdc55164
diff --git a/modules/ssh_keygen b/external_modules/ssh_keygen
-Subproject ca53363249b58af96f90cb810c7c51dda8ba803
+Subproject ca53363249b58af96f90cb810c7c51dda8ba803
diff --git a/modules/ssl b/external_modules/ssl
-Subproject c1cef11d63da71c7599e905ff0598d21799ab8c
+Subproject c1cef11d63da71c7599e905ff0598d21799ab8c
diff --git a/modules/stdlib b/external_modules/stdlib
-Subproject 0bb25fb19904e8b346a25204f787b8bdc5140ba
+Subproject 0bb25fb19904e8b346a25204f787b8bdc5140ba
diff --git a/modules/sudo b/external_modules/sudo
-Subproject 1338166b0baeed32eed7458f182c955353be9e8
+Subproject 1338166b0baeed32eed7458f182c955353be9e8
diff --git a/modules/systemd b/external_modules/systemd
-Subproject b0a93b8c4fa18f1f2c477c5348e9bccd3bdebd6
+Subproject b0a93b8c4fa18f1f2c477c5348e9bccd3bdebd6
diff --git a/modules/xmpp b/external_modules/xmpp
-Subproject d18dd07ffdf6c33942bd0c277cb24aafa513cbd
+Subproject d18dd07ffdf6c33942bd0c277cb24aafa513cbd
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/scripts/arch_install_script.sh b/scripts/arch_install_script.sh
index a16b796..2d0d695 100755
--- a/scripts/arch_install_script.sh
+++ b/scripts/arch_install_script.sh
@@ -12,7 +12,7 @@ pacman-key --populate archlinux
 git clone -b $git_branch --recursive https://git.immae.eu/perso/Immae/Projets/Puppet.git $CODE_PATH
 
 export FACTER_in_chroot="yes"
-puppet apply --environment $environment --tags base_installation --test $CODE_PATH/manifests/site.pp
+puppet apply --environment $environment --tags base_installation --modulepath $CODE_PATH/modules:$CODE_PATH/external_modules --test $CODE_PATH/manifests/site.pp
 # The password seed requires puppet to be run twice
-puppet apply --environment $environment --tags base_installation --test $CODE_PATH/manifests/site.pp
+puppet apply --environment $environment --tags base_installation --modulepath $CODE_PATH/modules:$CODE_PATH/external_modules --test $CODE_PATH/manifests/site.pp