projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b7e4468
)
spacing
author
Peter Palfrader
<peter@palfrader.org>
Tue, 10 Dec 2013 17:26:37 +0000
(18:26 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Tue, 10 Dec 2013 17:26:37 +0000
(18:26 +0100)
modules/motd/templates/motd.erb
patch
|
blob
|
history
diff --git
a/modules/motd/templates/motd.erb
b/modules/motd/templates/motd.erb
index
0b459c1
..
b371a90
100644
(file)
--- a/
modules/motd/templates/motd.erb
+++ b/
modules/motd/templates/motd.erb
@@
-24,12
+24,12
@@
end
purp = ''
if scope.lookupvar('site::nodeinfo').has_key?('nameinfo')
purp = ''
if scope.lookupvar('site::nodeinfo').has_key?('nameinfo')
- purp +=
wrap(scope.lookupvar('site::nodeinfo')['nameinfo']) + "\n
\n"
+ purp +=
" " + wrap(scope.lookupvar('site::nodeinfo')['nameinfo']) + "
\n"
end
ninfo = scope.lookupvar('site::nodeinfo')
end
ninfo = scope.lookupvar('site::nodeinfo')
-purp += 'Welcome to ' + fqdn
+purp += '
Welcome to ' + fqdn
if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose'))
p = scope.lookupvar('site::nodeinfo')['ldap']['purpose'].clone()
extra = ''
if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose'))
p = scope.lookupvar('site::nodeinfo')['ldap']['purpose'].clone()
extra = ''
@@
-84,11
+84,11
@@
if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('physicalHost'))
else
phys_host = 'physical host'
end
else
phys_host = 'physical host'
end
- purp += wrap("This virtual server runs on the #{phys_host} #{ninfo['ldap']['physicalHost'][0]}, " +
+ purp += wrap("
This virtual server runs on the #{phys_host} #{ninfo['ldap']['physicalHost'][0]}, " +
"which is hosted at #{ninfo['hoster']['longname']}."
)
elsif scope.lookupvar('site::nodeinfo')['hoster']['name']
"which is hosted at #{ninfo['hoster']['longname']}."
)
elsif scope.lookupvar('site::nodeinfo')['hoster']['name']
- purp += wrap("This server is hosted at #{ninfo['hoster']['longname']}.")
+ purp += wrap("
This server is hosted at #{ninfo['hoster']['longname']}.")
end
end
@@
-116,7
+116,7
@@
end
if scope.lookupvar('::cluster').to_s != 'undefined'
if scope.lookupvar('::cluster').to_s != 'undefined'
- purp += "\nThis server is a node in ganeti cluster: "
+ purp += "\n
This server is a node in ganeti cluster: "
purp += scope.lookupvar('::cluster').to_s + ":\n"
purp += "\t" + scope.lookupvar('::cluster_nodes').to_s.split.sort.map{ |x| x.split('.')[0] }.join(", ") + ".\n"
purp += scope.lookupvar('::cluster').to_s + ":\n"
purp += "\t" + scope.lookupvar('::cluster_nodes').to_s.split.sort.map{ |x| x.split('.')[0] }.join(", ") + ".\n"