coren has submitted this change and it was merged.

Change subject: motd is now project wide
......................................................................


motd is now project wide

Change-Id: I6f3d49efa97fe39617ad98df4eb2d565a2100b41
---
A modules/toollabs/files/profile-tool-labs.sh
M modules/toollabs/manifests/init.pp
2 files changed, 17 insertions(+), 0 deletions(-)

Approvals:
  coren: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/toollabs/files/profile-tool-labs.sh 
b/modules/toollabs/files/profile-tool-labs.sh
new file mode 100644
index 0000000..5759874
--- /dev/null
+++ b/modules/toollabs/files/profile-tool-labs.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+if tty -s
+then
+  [ -f /data/project/.system/tips.sh ] && /data/project/.system/tips.sh
+fi
diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index 995eca7..1f7e89d 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -57,11 +57,23 @@
     group => "root",
   }
 
+  # this is a link to shared folder
   file { "/shared":
     ensure => link,
     target => "/data/project/.shared";
   }
 
+  # this file contains the motd tips and also the admin motd script
+  # in fact it just check if the shared script exist and if so
+  # it executes it
+  file { "/etc/profile.d/tips.sh":
+    ensure => file,
+    source => "puppet:///modules/toollabs/profile-tool-labs.sh",
+    mode => "0555",
+    owner => "root",
+    group => "root",
+  }
+
 
   # Tool Labs is enduser-facing, so we want to control the motd
   # properly (most things make no sense for community users: they

-- 
To view, visit https://gerrit.wikimedia.org/r/64285
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6f3d49efa97fe39617ad98df4eb2d565a2100b41
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Petrb <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to