From bfd8ca3f9b05a8d8028bca0845e579f45156f244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 28 Apr 2018 16:59:07 +0200 Subject: Move external modules to other place --- .gitmodules | 40 +++++++++++----------- external_modules/apache | 1 + external_modules/archive | 1 + external_modules/concat | 1 + external_modules/cron | 1 + external_modules/fail2ban | 1 + external_modules/inifile | 1 + external_modules/letsencrypt | 1 + external_modules/logrotate | 1 + external_modules/nodejs | 1 + external_modules/pacman | 1 + external_modules/postgresql | 1 + external_modules/reboot | 1 + external_modules/redis | 1 + external_modules/ssh | 1 + external_modules/ssh_keygen | 1 + external_modules/ssl | 1 + external_modules/stdlib | 1 + external_modules/sudo | 1 + external_modules/systemd | 1 + external_modules/xmpp | 1 + modules/apache | 1 - modules/archive | 1 - .../templates/puppet/puppet.conf.erb | 3 ++ modules/concat | 1 - modules/cron | 1 - modules/fail2ban | 1 - modules/inifile | 1 - modules/letsencrypt | 1 - modules/logrotate | 1 - modules/nodejs | 1 - modules/pacman | 1 - modules/postgresql | 1 - modules/reboot | 1 - modules/redis | 1 - modules/ssh | 1 - modules/ssh_keygen | 1 - modules/ssl | 1 - modules/stdlib | 1 - modules/sudo | 1 - modules/systemd | 1 - modules/xmpp | 1 - scripts/arch_install_script.sh | 4 +-- 43 files changed, 45 insertions(+), 42 deletions(-) create mode 160000 external_modules/apache create mode 160000 external_modules/archive create mode 160000 external_modules/concat create mode 160000 external_modules/cron create mode 160000 external_modules/fail2ban create mode 160000 external_modules/inifile create mode 160000 external_modules/letsencrypt create mode 160000 external_modules/logrotate create mode 160000 external_modules/nodejs create mode 160000 external_modules/pacman create mode 160000 external_modules/postgresql create mode 160000 external_modules/reboot create mode 160000 external_modules/redis create mode 160000 external_modules/ssh create mode 160000 external_modules/ssh_keygen create mode 160000 external_modules/ssl create mode 160000 external_modules/stdlib create mode 160000 external_modules/sudo create mode 160000 external_modules/systemd create mode 160000 external_modules/xmpp delete mode 160000 modules/apache delete mode 160000 modules/archive delete mode 160000 modules/concat delete mode 160000 modules/cron delete mode 160000 modules/fail2ban delete mode 160000 modules/inifile delete mode 160000 modules/letsencrypt delete mode 160000 modules/logrotate delete mode 160000 modules/nodejs delete mode 160000 modules/pacman delete mode 160000 modules/postgresql delete mode 160000 modules/reboot delete mode 160000 modules/redis delete mode 160000 modules/ssh delete mode 160000 modules/ssh_keygen delete mode 160000 modules/ssl delete mode 160000 modules/stdlib delete mode 160000 modules/sudo delete mode 160000 modules/systemd delete mode 160000 modules/xmpp 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/external_modules/apache b/external_modules/apache new file mode 160000 index 0000000..42c1b5c --- /dev/null +++ b/external_modules/apache @@ -0,0 +1 @@ +Subproject commit 42c1b5cae109630a53be89eda10c5c761c6d3689 diff --git a/external_modules/archive b/external_modules/archive new file mode 160000 index 0000000..9af5cad --- /dev/null +++ b/external_modules/archive @@ -0,0 +1 @@ +Subproject commit 9af5cad2bbaafe0498032c38a37835e4ccba7d22 diff --git a/external_modules/concat b/external_modules/concat new file mode 160000 index 0000000..b783e1e --- /dev/null +++ b/external_modules/concat @@ -0,0 +1 @@ +Subproject commit b783e1e99def0bf45a391a2ebce5a39bd4174e11 diff --git a/external_modules/cron b/external_modules/cron new file mode 160000 index 0000000..d90d9be --- /dev/null +++ b/external_modules/cron @@ -0,0 +1 @@ +Subproject commit d90d9be088ad5008018ada87c30ceb314a46ed77 diff --git a/external_modules/fail2ban b/external_modules/fail2ban new file mode 160000 index 0000000..c4f816d --- /dev/null +++ b/external_modules/fail2ban @@ -0,0 +1 @@ +Subproject commit c4f816ded7245641ab70d553dc27f635f07614fa diff --git a/external_modules/inifile b/external_modules/inifile new file mode 160000 index 0000000..e5d624d --- /dev/null +++ b/external_modules/inifile @@ -0,0 +1 @@ +Subproject commit e5d624da43c3571e476ddfa4bbfde4acc5800f99 diff --git a/external_modules/letsencrypt b/external_modules/letsencrypt new file mode 160000 index 0000000..55ac1e9 --- /dev/null +++ b/external_modules/letsencrypt @@ -0,0 +1 @@ +Subproject commit 55ac1e9c731b6dbfc380cd282c39f273223fcd53 diff --git a/external_modules/logrotate b/external_modules/logrotate new file mode 160000 index 0000000..a528845 --- /dev/null +++ b/external_modules/logrotate @@ -0,0 +1 @@ +Subproject commit a528845d7a172c939a70fe369de382cac22e9b5a diff --git a/external_modules/nodejs b/external_modules/nodejs new file mode 160000 index 0000000..c771342 --- /dev/null +++ b/external_modules/nodejs @@ -0,0 +1 @@ +Subproject commit c77134280b7e30f3c8a94448e04de5c238e6c89c diff --git a/external_modules/pacman b/external_modules/pacman new file mode 160000 index 0000000..5668cfa --- /dev/null +++ b/external_modules/pacman @@ -0,0 +1 @@ +Subproject commit 5668cfa6dff56d5965ab2143fd0aeb322518d9c8 diff --git a/external_modules/postgresql b/external_modules/postgresql new file mode 160000 index 0000000..52ea030 --- /dev/null +++ b/external_modules/postgresql @@ -0,0 +1 @@ +Subproject commit 52ea030ad94397ba0d066c36c3028a255341f9fd diff --git a/external_modules/reboot b/external_modules/reboot new file mode 160000 index 0000000..4bb63a6 --- /dev/null +++ b/external_modules/reboot @@ -0,0 +1 @@ +Subproject commit 4bb63a6c48c5948e757b1abe561b69772b46e9f1 diff --git a/external_modules/redis b/external_modules/redis new file mode 160000 index 0000000..bfcc212 --- /dev/null +++ b/external_modules/redis @@ -0,0 +1 @@ +Subproject commit bfcc2120f7b83342b03241d1429028a6defdd0da diff --git a/external_modules/ssh b/external_modules/ssh new file mode 160000 index 0000000..1c1dc57 --- /dev/null +++ b/external_modules/ssh @@ -0,0 +1 @@ +Subproject commit 1c1dc57e12baa1e67913456e3e959b3bdc551649 diff --git a/external_modules/ssh_keygen b/external_modules/ssh_keygen new file mode 160000 index 0000000..ca53363 --- /dev/null +++ b/external_modules/ssh_keygen @@ -0,0 +1 @@ +Subproject commit ca53363249b58af96f90cb810c7c51dda8ba803b diff --git a/external_modules/ssl b/external_modules/ssl new file mode 160000 index 0000000..c1cef11 --- /dev/null +++ b/external_modules/ssl @@ -0,0 +1 @@ +Subproject commit c1cef11d63da71c7599e905ff0598d21799ab8cc diff --git a/external_modules/stdlib b/external_modules/stdlib new file mode 160000 index 0000000..0bb25fb --- /dev/null +++ b/external_modules/stdlib @@ -0,0 +1 @@ +Subproject commit 0bb25fb19904e8b346a25204f787b8bdc5140bae diff --git a/external_modules/sudo b/external_modules/sudo new file mode 160000 index 0000000..1338166 --- /dev/null +++ b/external_modules/sudo @@ -0,0 +1 @@ +Subproject commit 1338166b0baeed32eed7458f182c955353be9e8c diff --git a/external_modules/systemd b/external_modules/systemd new file mode 160000 index 0000000..b0a93b8 --- /dev/null +++ b/external_modules/systemd @@ -0,0 +1 @@ +Subproject commit b0a93b8c4fa18f1f2c477c5348e9bccd3bdebd6b diff --git a/external_modules/xmpp b/external_modules/xmpp new file mode 160000 index 0000000..d18dd07 --- /dev/null +++ b/external_modules/xmpp @@ -0,0 +1 @@ +Subproject commit d18dd07ffdf6c33942bd0c277cb24aafa513cbd7 diff --git a/modules/apache b/modules/apache deleted file mode 160000 index 42c1b5c..0000000 --- a/modules/apache +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 42c1b5cae109630a53be89eda10c5c761c6d3689 diff --git a/modules/archive b/modules/archive deleted file mode 160000 index 9af5cad..0000000 --- a/modules/archive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9af5cad2bbaafe0498032c38a37835e4ccba7d22 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 index b783e1e..0000000 --- a/modules/concat +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b783e1e99def0bf45a391a2ebce5a39bd4174e11 diff --git a/modules/cron b/modules/cron deleted file mode 160000 index d90d9be..0000000 --- a/modules/cron +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d90d9be088ad5008018ada87c30ceb314a46ed77 diff --git a/modules/fail2ban b/modules/fail2ban deleted file mode 160000 index c4f816d..0000000 --- a/modules/fail2ban +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c4f816ded7245641ab70d553dc27f635f07614fa diff --git a/modules/inifile b/modules/inifile deleted file mode 160000 index e5d624d..0000000 --- a/modules/inifile +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e5d624da43c3571e476ddfa4bbfde4acc5800f99 diff --git a/modules/letsencrypt b/modules/letsencrypt deleted file mode 160000 index 55ac1e9..0000000 --- a/modules/letsencrypt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 55ac1e9c731b6dbfc380cd282c39f273223fcd53 diff --git a/modules/logrotate b/modules/logrotate deleted file mode 160000 index a528845..0000000 --- a/modules/logrotate +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a528845d7a172c939a70fe369de382cac22e9b5a diff --git a/modules/nodejs b/modules/nodejs deleted file mode 160000 index c771342..0000000 --- a/modules/nodejs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c77134280b7e30f3c8a94448e04de5c238e6c89c diff --git a/modules/pacman b/modules/pacman deleted file mode 160000 index 5668cfa..0000000 --- a/modules/pacman +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5668cfa6dff56d5965ab2143fd0aeb322518d9c8 diff --git a/modules/postgresql b/modules/postgresql deleted file mode 160000 index 52ea030..0000000 --- a/modules/postgresql +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 52ea030ad94397ba0d066c36c3028a255341f9fd diff --git a/modules/reboot b/modules/reboot deleted file mode 160000 index 4bb63a6..0000000 --- a/modules/reboot +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4bb63a6c48c5948e757b1abe561b69772b46e9f1 diff --git a/modules/redis b/modules/redis deleted file mode 160000 index bfcc212..0000000 --- a/modules/redis +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bfcc2120f7b83342b03241d1429028a6defdd0da diff --git a/modules/ssh b/modules/ssh deleted file mode 160000 index 1c1dc57..0000000 --- a/modules/ssh +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1c1dc57e12baa1e67913456e3e959b3bdc551649 diff --git a/modules/ssh_keygen b/modules/ssh_keygen deleted file mode 160000 index ca53363..0000000 --- a/modules/ssh_keygen +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ca53363249b58af96f90cb810c7c51dda8ba803b diff --git a/modules/ssl b/modules/ssl deleted file mode 160000 index c1cef11..0000000 --- a/modules/ssl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c1cef11d63da71c7599e905ff0598d21799ab8cc diff --git a/modules/stdlib b/modules/stdlib deleted file mode 160000 index 0bb25fb..0000000 --- a/modules/stdlib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0bb25fb19904e8b346a25204f787b8bdc5140bae diff --git a/modules/sudo b/modules/sudo deleted file mode 160000 index 1338166..0000000 --- a/modules/sudo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1338166b0baeed32eed7458f182c955353be9e8c diff --git a/modules/systemd b/modules/systemd deleted file mode 160000 index b0a93b8..0000000 --- a/modules/systemd +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b0a93b8c4fa18f1f2c477c5348e9bccd3bdebd6b diff --git a/modules/xmpp b/modules/xmpp deleted file mode 160000 index d18dd07..0000000 --- a/modules/xmpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d18dd07ffdf6c33942bd0c277cb24aafa513cbd7 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 -- cgit v1.2.3