Merge branch 'dev'

diff --git a/.gitmodules b/.gitmodules
index c75f8038fa9525a599ed5abc182b373d47e7c7ab..357cc1dbe45dfa4f05a9605f7ab097f784f6dc6d 100644 (file)
--- 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
similarity index 100%
rename from modules/apache
rename to external_modules/apache

diff --git a/modules/archive b/external_modules/archive
similarity index 100%
rename from modules/archive
rename to external_modules/archive

diff --git a/modules/concat b/external_modules/concat
similarity index 100%
rename from modules/concat
rename to external_modules/concat

diff --git a/modules/cron b/external_modules/cron
similarity index 100%
rename from modules/cron
rename to external_modules/cron

diff --git a/modules/fail2ban b/external_modules/fail2ban
similarity index 100%
rename from modules/fail2ban
rename to external_modules/fail2ban

diff --git a/modules/inifile b/external_modules/inifile
similarity index 100%
rename from modules/inifile
rename to external_modules/inifile

diff --git a/modules/letsencrypt b/external_modules/letsencrypt
similarity index 100%
rename from modules/letsencrypt
rename to external_modules/letsencrypt

diff --git a/modules/logrotate b/external_modules/logrotate
similarity index 100%
rename from modules/logrotate
rename to external_modules/logrotate

diff --git a/modules/nodejs b/external_modules/nodejs
similarity index 100%
rename from modules/nodejs
rename to external_modules/nodejs

diff --git a/modules/pacman b/external_modules/pacman
similarity index 100%
rename from modules/pacman
rename to external_modules/pacman

diff --git a/modules/postgresql b/external_modules/postgresql
similarity index 100%
rename from modules/postgresql
rename to external_modules/postgresql

diff --git a/modules/reboot b/external_modules/reboot
similarity index 100%
rename from modules/reboot
rename to external_modules/reboot

diff --git a/modules/redis b/external_modules/redis
similarity index 100%
rename from modules/redis
rename to external_modules/redis

diff --git a/modules/ssh b/external_modules/ssh
similarity index 100%
rename from modules/ssh
rename to external_modules/ssh

diff --git a/modules/ssh_keygen b/external_modules/ssh_keygen
similarity index 100%
rename from modules/ssh_keygen
rename to external_modules/ssh_keygen

diff --git a/modules/ssl b/external_modules/ssl
similarity index 100%
rename from modules/ssl
rename to external_modules/ssl

diff --git a/modules/stdlib b/external_modules/stdlib
similarity index 100%
rename from modules/stdlib
rename to external_modules/stdlib

diff --git a/modules/sudo b/external_modules/sudo
similarity index 100%
rename from modules/sudo
rename to external_modules/sudo

diff --git a/modules/systemd b/external_modules/systemd
similarity index 100%
rename from modules/systemd
rename to external_modules/systemd

diff --git a/modules/xmpp b/external_modules/xmpp
similarity index 100%
rename from modules/xmpp
rename to external_modules/xmpp

diff --git a/modules/aur/manifests/aura.pp b/modules/aur/manifests/aura.pp
index 3e06f0a18289287924c713a775c67d0ae0816882..3074885a9f42d2c0bc36be6e137ea5992c38268a 100644 (file)
--- 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 37eba8ef0cbc5d151f30048e3df4c03299fa8700..03b33bba119d8fedbf9e3c4947648d486dae3708 100644 (file)
--- 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 a16b796a4cbd905285a3c34bf5f4e6162fa12208..2d0d695514c6797c9119e889c11b53c1f4f3ca7b 100755 (executable)
--- 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