Changeset 10568 in genesis

Timestamp:

Apr 24, 2012, 7:39:21 PM (13 years ago)

Author:

rick

Message:

Put service which are used in the motd listing.

Related-To: nodefactory#125

File:

• tools/gformat.py (modified) (1 diff)

tools/gformat.py

@@ -709 +709 @@
 def generate_motd(datadump):
   """ Generate configuration file '/etc/motd' """
-  output = """\
+  output = Template("""\
 FreeBSD 9.0-RELEASE (kernel.wleiden) #0 r230587: Sun Jan 29 17:09:57 CET 2012
 
-  WWW: %(autogen_fqdn)s - http://www.wirelessleiden.nl
-  Loc: %(location)s
-
+  WWW: {{ autogen_fqdn }} - http://www.wirelessleiden.nl
+  Loc: {{ location }}
+
+Services:
+{% if board == "ALIX2" -%}
+ - Core Node
+{% else -%}
+ - Hulp Node
+{% endif -%}
+{% if service_proxy -%}
+ - Normal Proxy
+{% endif -%}
+{% if service_ileiden -%} 
+ - iLeiden Proxy
+{% endif %}
 Interlinks:
-""" % datadump
+""").render(datadump)
 
   # XXX: This is a hacky way to get the required data