From bfd8ca3f9b05a8d8028bca0845e579f45156f244 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 28 Apr 2018 16:59:07 +0200 Subject: [PATCH] Move external modules to other place --- .gitmodules | 40 +++++++++---------- {modules => external_modules}/apache | 0 {modules => external_modules}/archive | 0 {modules => external_modules}/concat | 0 {modules => external_modules}/cron | 0 {modules => external_modules}/fail2ban | 0 {modules => external_modules}/inifile | 0 {modules => external_modules}/letsencrypt | 0 {modules => external_modules}/logrotate | 0 {modules => external_modules}/nodejs | 0 {modules => external_modules}/pacman | 0 {modules => external_modules}/postgresql | 0 {modules => external_modules}/reboot | 0 {modules => external_modules}/redis | 0 {modules => external_modules}/ssh | 0 {modules => external_modules}/ssh_keygen | 0 {modules => external_modules}/ssl | 0 {modules => external_modules}/stdlib | 0 {modules => external_modules}/sudo | 0 {modules => external_modules}/systemd | 0 {modules => external_modules}/xmpp | 0 .../templates/puppet/puppet.conf.erb | 3 ++ scripts/arch_install_script.sh | 4 +- 23 files changed, 25 insertions(+), 22 deletions(-) rename {modules => external_modules}/apache (100%) rename {modules => external_modules}/archive (100%) rename {modules => external_modules}/concat (100%) rename {modules => external_modules}/cron (100%) rename {modules => external_modules}/fail2ban (100%) rename {modules => external_modules}/inifile (100%) rename {modules => external_modules}/letsencrypt (100%) rename {modules => external_modules}/logrotate (100%) rename {modules => external_modules}/nodejs (100%) rename {modules => external_modules}/pacman (100%) rename {modules => external_modules}/postgresql (100%) rename {modules => external_modules}/reboot (100%) rename {modules => external_modules}/redis (100%) rename {modules => external_modules}/ssh (100%) rename {modules => external_modules}/ssh_keygen (100%) rename {modules => external_modules}/ssl (100%) rename {modules => external_modules}/stdlib (100%) rename {modules => external_modules}/sudo (100%) rename {modules => external_modules}/systemd (100%) rename {modules => external_modules}/xmpp (100%) 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 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/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 -- 2.41.0