aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2018-07-14 10:49:21 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2018-07-14 11:20:15 +0200
commit220496056eb730f204f9d21d61d10d41d876c5a1 (patch)
tree8c567596f7cbe61d1c2acc7559284252841ce268 /modules
parent1b2e270afc9da7bbab85e0d729d317a97cca962f (diff)
downloadPuppet-220496056eb730f204f9d21d61d10d41d876c5a1.tar.gz
Puppet-220496056eb730f204f9d21d61d10d41d876c5a1.tar.zst
Puppet-220496056eb730f204f9d21d61d10d41d876c5a1.zip
Fix package dependencies for base installation
Diffstat (limited to 'modules')
-rw-r--r--modules/base_installation/manifests/cronie.pp4
-rw-r--r--modules/base_installation/manifests/grub.pp7
-rw-r--r--modules/base_installation/manifests/services.pp15
-rw-r--r--modules/base_installation/manifests/ssh.pp5
-rw-r--r--modules/base_installation/manifests/users.pp3
5 files changed, 22 insertions, 12 deletions
diff --git a/modules/base_installation/manifests/cronie.pp b/modules/base_installation/manifests/cronie.pp
index 3558d9f..ca3eb2a 100644
--- a/modules/base_installation/manifests/cronie.pp
+++ b/modules/base_installation/manifests/cronie.pp
@@ -1,6 +1,10 @@
1class base_installation::cronie inherits base_installation { 1class base_installation::cronie inherits base_installation {
2 ensure_packages(['cronie']) 2 ensure_packages(['cronie'])
3 3
4 Package["cronie"] -> Cron::Job <| |>
5 Package["cronie"] -> Cron::Job::Multiple <| |>
6 Package["cronie"] -> Cron::Daily <| |>
7
4 unless empty($base_installation::puppet_code_path) { 8 unless empty($base_installation::puppet_code_path) {
5 file { 'post-hook': 9 file { 'post-hook':
6 ensure => file, 10 ensure => file,
diff --git a/modules/base_installation/manifests/grub.pp b/modules/base_installation/manifests/grub.pp
index 0a96aa7..208b745 100644
--- a/modules/base_installation/manifests/grub.pp
+++ b/modules/base_installation/manifests/grub.pp
@@ -9,9 +9,10 @@ class base_installation::grub inherits base_installation {
9 # } 9 # }
10 10
11 file_line { "/etc/default/grub#GRUB_CMDLINE_LINUX": 11 file_line { "/etc/default/grub#GRUB_CMDLINE_LINUX":
12 path => "/etc/default/grub", 12 path => "/etc/default/grub",
13 line => 'GRUB_CMDLINE_LINUX=" console=tty0 console=ttyS0,115200"', 13 line => 'GRUB_CMDLINE_LINUX=" console=tty0 console=ttyS0,115200"',
14 match => '^GRUB_CMDLINE_LINUX=' 14 match => '^GRUB_CMDLINE_LINUX=',
15 require => Package["grub"],
15 } 16 }
16 17
17 # exec { 'update GRUB config': 18 # exec { 'update GRUB config':
diff --git a/modules/base_installation/manifests/services.pp b/modules/base_installation/manifests/services.pp
index 1659f97..f24b55f 100644
--- a/modules/base_installation/manifests/services.pp
+++ b/modules/base_installation/manifests/services.pp
@@ -7,13 +7,15 @@ class base_installation::services inherits base_installation {
7 } 7 }
8 8
9 service { "sshd": 9 service { "sshd":
10 ensure => $ensure, 10 ensure => $ensure,
11 enable => true, 11 enable => true,
12 require => Package["openssh"],
12 } 13 }
13 14
14 service { "atd": 15 service { "atd":
15 ensure => $ensure, 16 ensure => $ensure,
16 enable => true 17 enable => true,
18 require => Package["at"],
17 } 19 }
18 20
19 service { "systemd-networkd": 21 service { "systemd-networkd":
@@ -32,8 +34,9 @@ class base_installation::services inherits base_installation {
32 } 34 }
33 35
34 service { "cronie": 36 service { "cronie":
35 ensure => $ensure, 37 ensure => $ensure,
36 enable => true, 38 enable => true,
39 require => Package["cronie"],
37 } 40 }
38 41
39 file { '/etc/systemd/system/getty@tty1.service.d/': 42 file { '/etc/systemd/system/getty@tty1.service.d/':
diff --git a/modules/base_installation/manifests/ssh.pp b/modules/base_installation/manifests/ssh.pp
index 43769e9..d6317d5 100644
--- a/modules/base_installation/manifests/ssh.pp
+++ b/modules/base_installation/manifests/ssh.pp
@@ -1,13 +1,14 @@
1class base_installation::ssh inherits base_installation { 1class base_installation::ssh inherits base_installation {
2 class { 'ssh::server': 2 class { 'ssh::server':
3 storeconfigs_enabled => false, 3 storeconfigs_enabled => false,
4 options => { 4 options => {
5 'AcceptEnv' => undef, 5 'AcceptEnv' => undef,
6 'X11Forwarding' => 'yes', 6 'X11Forwarding' => 'yes',
7 'PrintMotd' => 'no', 7 'PrintMotd' => 'no',
8 'ChallengeResponseAuthentication' => 'no', 8 'ChallengeResponseAuthentication' => 'no',
9 'Subsystem' => 'sftp /usr/lib/openssh/sftp-server', 9 'Subsystem' => 'sftp /usr/lib/openssh/sftp-server',
10 } 10 },
11 require => Package["openssh"]
11 } 12 }
12 13
13 contain "ssh::server" 14 contain "ssh::server"
diff --git a/modules/base_installation/manifests/users.pp b/modules/base_installation/manifests/users.pp
index d0ac449..1ce5da7 100644
--- a/modules/base_installation/manifests/users.pp
+++ b/modules/base_installation/manifests/users.pp
@@ -15,7 +15,8 @@ class base_installation::users (
15 15
16 sudo::conf { 'wheel': 16 sudo::conf { 'wheel':
17 priority => 10, 17 priority => 10,
18 content => "%wheel ALL=(ALL) ALL" 18 content => "%wheel ALL=(ALL) ALL",
19 require => Package["sudo"],
19 } 20 }
20 21
21 contain "sudo" 22 contain "sudo"