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 --- modules/apache | 1 - modules/archive | 1 - modules/base_installation/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 - 21 files changed, 3 insertions(+), 20 deletions(-) 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 (limited to 'modules') 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 -- cgit v1.2.3 From d7b6e53e01c414582f0ff4cdc07dc963838b5192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 28 Apr 2018 17:26:39 +0200 Subject: Fix aur url --- modules/aur/manifests/aura.pp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'modules') 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'], -- cgit v1.2.3