aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules40
m---------external_modules/apache (renamed from modules/apache)0
m---------external_modules/archive (renamed from modules/archive)0
m---------external_modules/concat (renamed from modules/concat)0
m---------external_modules/cron (renamed from modules/cron)0
m---------external_modules/fail2ban (renamed from modules/fail2ban)0
m---------external_modules/inifile (renamed from modules/inifile)0
m---------external_modules/letsencrypt (renamed from modules/letsencrypt)0
m---------external_modules/logrotate (renamed from modules/logrotate)0
m---------external_modules/nodejs (renamed from modules/nodejs)0
m---------external_modules/pacman (renamed from modules/pacman)0
m---------external_modules/postgresql (renamed from modules/postgresql)0
m---------external_modules/reboot (renamed from modules/reboot)0
m---------external_modules/redis (renamed from modules/redis)0
m---------external_modules/ssh (renamed from modules/ssh)0
m---------external_modules/ssh_keygen (renamed from modules/ssh_keygen)0
m---------external_modules/ssl (renamed from modules/ssl)0
m---------external_modules/stdlib (renamed from modules/stdlib)0
m---------external_modules/sudo (renamed from modules/sudo)0
m---------external_modules/systemd (renamed from modules/systemd)0
m---------external_modules/xmpp (renamed from modules/xmpp)0
-rw-r--r--modules/aur/manifests/aura.pp6
-rw-r--r--modules/base_installation/templates/puppet/puppet.conf.erb3
-rwxr-xr-xscripts/arch_install_script.sh4
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 @@
1[submodule "modules/stdlib"] 1[submodule "modules/stdlib"]
2 path = modules/stdlib 2 path = external_modules/stdlib
3 url = git://git.immae.eu/github/puppetlabs/puppetlabs-stdlib.git 3 url = git://git.immae.eu/github/puppetlabs/puppetlabs-stdlib.git
4[submodule "modules/reboot"] 4[submodule "modules/reboot"]
5 path = modules/reboot 5 path = external_modules/reboot
6 url = git://git.immae.eu/github/puppetlabs/puppetlabs-reboot.git 6 url = git://git.immae.eu/github/puppetlabs/puppetlabs-reboot.git
7[submodule "modules/systemd"] 7[submodule "modules/systemd"]
8 path = modules/systemd 8 path = external_modules/systemd
9 url = git://git.immae.eu/github/jkroepke/puppet-systemd.git 9 url = git://git.immae.eu/github/jkroepke/puppet-systemd.git
10[submodule "modules/inifile"] 10[submodule "modules/inifile"]
11 path = modules/inifile 11 path = external_modules/inifile
12 url = git://git.immae.eu/github/puppetlabs/puppetlabs-inifile.git 12 url = git://git.immae.eu/github/puppetlabs/puppetlabs-inifile.git
13[submodule "modules/sudo"] 13[submodule "modules/sudo"]
14 path = modules/sudo 14 path = external_modules/sudo
15 url = git://git.immae.eu/github/saz/puppet-sudo.git 15 url = git://git.immae.eu/github/saz/puppet-sudo.git
16[submodule "modules/ssh"] 16[submodule "modules/ssh"]
17 path = modules/ssh 17 path = external_modules/ssh
18 url = git://git.immae.eu/github/saz/puppet-ssh.git 18 url = git://git.immae.eu/github/saz/puppet-ssh.git
19[submodule "modules/concat"] 19[submodule "modules/concat"]
20 path = modules/concat 20 path = external_modules/concat
21 url = git://git.immae.eu/github/puppetlabs/puppetlabs-concat.git 21 url = git://git.immae.eu/github/puppetlabs/puppetlabs-concat.git
22[submodule "modules/fail2ban"] 22[submodule "modules/fail2ban"]
23 path = modules/fail2ban 23 path = external_modules/fail2ban
24 url = git://git.immae.eu/github/lelutin/puppet-fail2ban 24 url = git://git.immae.eu/github/lelutin/puppet-fail2ban
25[submodule "modules/logrotate"] 25[submodule "modules/logrotate"]
26 path = modules/logrotate 26 path = external_modules/logrotate
27 url = git://git.immae.eu/github/yo61/puppet-logrotate.git 27 url = git://git.immae.eu/github/yo61/puppet-logrotate.git
28[submodule "modules/pacman"] 28[submodule "modules/pacman"]
29 path = modules/pacman 29 path = external_modules/pacman
30 url = git://git.immae.eu/github/aboe76/puppet-pacman 30 url = git://git.immae.eu/github/aboe76/puppet-pacman
31[submodule "modules/postgresql"] 31[submodule "modules/postgresql"]
32 path = modules/postgresql 32 path = external_modules/postgresql
33 url = git://git.immae.eu/github/puppetlabs/puppetlabs-postgresql.git 33 url = git://git.immae.eu/github/puppetlabs/puppetlabs-postgresql.git
34[submodule "modules/archive"] 34[submodule "modules/archive"]
35 path = modules/archive 35 path = external_modules/archive
36 url = git://git.immae.eu/github/voxpupuli/puppet-archive.git 36 url = git://git.immae.eu/github/voxpupuli/puppet-archive.git
37[submodule "modules/apache"] 37[submodule "modules/apache"]
38 path = modules/apache 38 path = external_modules/apache
39 url = git://git.immae.eu/github/puppetlabs/puppetlabs-apache.git 39 url = git://git.immae.eu/github/puppetlabs/puppetlabs-apache.git
40[submodule "modules/letsencrypt"] 40[submodule "modules/letsencrypt"]
41 path = modules/letsencrypt 41 path = external_modules/letsencrypt
42 url = git://git.immae.eu/github/voxpupuli/puppet-letsencrypt.git 42 url = git://git.immae.eu/github/voxpupuli/puppet-letsencrypt.git
43[submodule "modules/nodejs"] 43[submodule "modules/nodejs"]
44 path = modules/nodejs 44 path = external_modules/nodejs
45 url = git://git.immae.eu/github/voxpupuli/puppet-nodejs 45 url = git://git.immae.eu/github/voxpupuli/puppet-nodejs
46[submodule "python/ovh"] 46[submodule "python/ovh"]
47 path = python/ovh 47 path = python/ovh
48 url = git://git.immae.eu/github/ovh/python-ovh 48 url = git://git.immae.eu/github/ovh/python-ovh
49[submodule "modules/ssh_keygen"] 49[submodule "modules/ssh_keygen"]
50 path = modules/ssh_keygen 50 path = external_modules/ssh_keygen
51 url = git://git.immae.eu/github/voxpupuli/puppet-ssh_keygen 51 url = git://git.immae.eu/github/voxpupuli/puppet-ssh_keygen
52[submodule "modules/xmpp"] 52[submodule "modules/xmpp"]
53 path = modules/xmpp 53 path = external_modules/xmpp
54 url = git://git.immae.eu/github/jamtur01/puppet-xmpp 54 url = git://git.immae.eu/github/jamtur01/puppet-xmpp
55[submodule "modules/ssl"] 55[submodule "modules/ssl"]
56 path = modules/ssl 56 path = external_modules/ssl
57 url = git://git.immae.eu/github/fnerdwq/puppet-ssl 57 url = git://git.immae.eu/github/fnerdwq/puppet-ssl
58[submodule "modules/cron"] 58[submodule "modules/cron"]
59 path = modules/cron 59 path = external_modules/cron
60 url = git://git.immae.eu/github/voxpupuli/puppet-cron 60 url = git://git.immae.eu/github/voxpupuli/puppet-cron
61[submodule "modules/redis"] 61[submodule "modules/redis"]
62 path = modules/redis 62 path = external_modules/redis
63 url = git://git.immae.eu/github/arioch/puppet-redis 63 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(
13 ensure_packages(['base-devel'], { 'install_options' => '--needed' }) 13 ensure_packages(['base-devel'], { 'install_options' => '--needed' })
14 ensure_packages(['gmp', 'pcre'], { 'install_options' => '--asdeps' }) 14 ensure_packages(['gmp', 'pcre'], { 'install_options' => '--asdeps' })
15 15
16 # aur.sh seems down
17 #$aur_url = "https://aur.sh"
18 $aur_url = "https://raw.githubusercontent.com/stuartpb/aur.sh/dc2f3fcaa90a4d3d1e8d746160559b5d3123a425/aur.sh"
19
16 exec { 'aur::aura': 20 exec { 'aur::aura':
17 cwd => "/tmp", 21 cwd => "/tmp",
18 path => "/usr/bin", 22 path => "/usr/bin",
19 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', 23 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",
20 user => "aur-builder", 24 user => "aur-builder",
21 unless => '/usr/bin/pacman -Qo aura', 25 unless => '/usr/bin/pacman -Qo aura',
22 require => Package['base-devel'], 26 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
4<% else %> 4<% else %>
5reports = store 5reports = store
6<% end %> 6<% end %>
7
8basemodulepath = <%= @puppet_code_path %>/modules:<%= @puppet_code_path %>/external_modules
9
7ssldir = <%= @puppet_ssl_path %> 10ssldir = <%= @puppet_ssl_path %>
8 11
9environment = <%= @environment %> 12environment = <%= @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
12git clone -b $git_branch --recursive https://git.immae.eu/perso/Immae/Projets/Puppet.git $CODE_PATH 12git clone -b $git_branch --recursive https://git.immae.eu/perso/Immae/Projets/Puppet.git $CODE_PATH
13 13
14export FACTER_in_chroot="yes" 14export FACTER_in_chroot="yes"
15puppet apply --environment $environment --tags base_installation --test $CODE_PATH/manifests/site.pp 15puppet apply --environment $environment --tags base_installation --modulepath $CODE_PATH/modules:$CODE_PATH/external_modules --test $CODE_PATH/manifests/site.pp
16# The password seed requires puppet to be run twice 16# The password seed requires puppet to be run twice
17puppet apply --environment $environment --tags base_installation --test $CODE_PATH/manifests/site.pp 17puppet apply --environment $environment --tags base_installation --modulepath $CODE_PATH/modules:$CODE_PATH/external_modules --test $CODE_PATH/manifests/site.pp
18 18