diff options
Diffstat (limited to '')
| -rw-r--r-- | manifests/workstation.pp | 15 | ||||
| -rw-r--r-- | manifests/workstation/family/archlinux.pp | 6 |
2 files changed, 3 insertions, 18 deletions
diff --git a/manifests/workstation.pp b/manifests/workstation.pp index 051f3fc..d70fa57 100644 --- a/manifests/workstation.pp +++ b/manifests/workstation.pp @@ -12,6 +12,8 @@ class profiles::workstation ( include ::profiles::group_profile + include ::profiles::repo + if ($facts['systemd']) { file { 'User ssh-agent service': path => '/etc/systemd/user/ssh-agent.service', @@ -119,17 +121,6 @@ class profiles::workstation ( source => 'puppet:///modules/profiles/passmenu', } - file { '/etc/sudoers': - validate_cmd => '/usr/bin/visudo -cf %', - content => @(EOF) - Defaults insults - root ALL=(ALL) ALL - %root ALL=(ALL) ALL - %wheel ALL=(ALL) ALL - - @includedir /etc/sudoers.d - | EOF - } - + include ::profiles::sudo include ::profiles::mounts } diff --git a/manifests/workstation/family/archlinux.pp b/manifests/workstation/family/archlinux.pp index f84946c..306b903 100644 --- a/manifests/workstation/family/archlinux.pp +++ b/manifests/workstation/family/archlinux.pp @@ -24,12 +24,6 @@ class profiles::workstation::family::archlinux { line => "MAKEFLAGS='-j${cpus}'" } - pacman::repo { 'adrift-space': - ensure => present, - server => 'http://repo.gandalf.adrift.space/arch', - sig_level => 'Optional', - } - # remove # - netctl |