Skip to content
This repository was archived by the owner on Apr 30, 2024. It is now read-only.

Commit 73a0afd

Browse files
committed
Added additional privileges to new machines
1 parent 888e20a commit 73a0afd

File tree

5 files changed

+41
-3
lines changed

5 files changed

+41
-3
lines changed

environments/production/manifests/site.pp

+6
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727
include common
2828
}
2929

30+
node /zhang\d+/ {
31+
include research_centos
32+
include gdm_login_screen
33+
include graylog
34+
}
35+
3036
node /biobankdb/ {
3137
include common
3238
include sssd

environments/production/modules/common/lib/facter/capture_conf.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def capture_configuration
5252
out.each_slice(3).map {|slice| slice.join("\n")}
5353
end
5454

55-
packages.each {|pack| json.push(extract_info_from pack)}
55+
packages.each {|package| json.push(extract_info_from package)}
5656

5757
return JSON.generate({:packages => json})
5858
end

environments/production/modules/environment_modules/manifests/init.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
$global_bash = '/etc/bashrc'
44

55
$packages = [ 'epel-release', 'environment-modules', 'libgfortran', 'libgnomecanvas', 'libpng12', 'bzr', 'make', 'cmake', 'wget', 'gcc-gfortran', 'm4', 'patch', 'qt-devel', 'qtwebkit-devel', 'python-devel', 'java-devel', 'fontconfig-devel', 'libXt-devel',
6-
'libXrender-devel', 'libXinerama-devel', 'libXaw-devel', 'swig', 'xz', 'intltool', 'mesa-libGLU-devel', 'libXmu-devel', 'gtk+', 'gtk+-devel', 'webkitgtk', 'compat-libtiff3']
6+
'libXrender-devel', 'libXinerama-devel', 'libXaw-devel', 'swig', 'xz', 'intltool', 'mesa-libGLU-devel', 'libXmu-devel', 'gtk+', 'gtk+-devel', 'compat-libtiff3'] # 'webkitgtk', 'compat-libtiff3']
77

88
$packages.each |$pack| {
99
package { "$pack":
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[org/gnome/login-screen]
22
banner-message-enable=true
3-
banner-message-text="For use by CryoEM. Use your normal VAI login information to log on."
3+
banner-message-text="Use your normal VAI login information to log on."

environments/production/modules/privileges/manifests/init.pp

+32
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
content => '%hpcadmins ALL=(ALL) ALL',
77
}
88

9+
sudo::conf { 'user':
10+
ensure => present,
11+
content => 'user ALL=(ALL) ALL',
12+
}
13+
914
sudo::conf { 'login':
1015
ensure => present,
1116
content => 'login ALL=(ALL) ALL',
@@ -86,5 +91,32 @@
8691
source => 'puppet:///modules/privileges/szabo',
8792
}
8893
}
94+
'triche-laptop.vai.org': {
95+
sudo::conf { 'triche':
96+
ensure => present,
97+
source => 'puppet:///modules/privileges/triche',
98+
}
99+
}
100+
/[Bb]ras\d+\.vai\.org/: {
101+
sudo::conf { 'bras':
102+
ensure => present,
103+
source => 'puppet:///modules/privileges/bras',
104+
}
105+
}
106+
107+
/[Tt]iedemann\d+\.vai\.org/: {
108+
sudo::conf { 'rochelle':
109+
ensure => present,
110+
source => 'puppet:///modules/privileges/rochelle',
111+
}
112+
}
113+
114+
/[Jj]ones\d+\.vai\.org/: {
115+
sudo::conf { 'jones':
116+
ensure => present,
117+
source => 'puppet:///modules/privileges/jones',
118+
}
119+
}
120+
89121
}
90122
}

0 commit comments

Comments
 (0)