Changeset 6339

Timestamp:

Oct 5, 2008, 10:27:59 PM (17 years ago)

Author:

RIck van der Zwet

Message:

• Fixed all templates to match to the more logical naming 'standard' and added a

number of comments on various places to explain for externals about certain WL
choices

• Revived TODO to match the more accurate status again

Location:

trunk

Files:

• TODO (modified) (1 diff)
• exodus/templates/freebsd-5.0/dhcpd.conf (modified) (3 diffs)
• exodus/templates/freebsd-5.0/named.conf (modified) (3 diffs)
• exodus/templates/freebsd-5.0/rc.local (modified) (1 diff)
• exodus/templates/freebsd-5.0/rc.node.local (modified) (1 diff)
• exodus/templates/freebsd-5.0/resolv.conf (modified) (1 diff)

trunk/TODO ¶

@@ -1 @@
-** Showstoppers
--> Document database layout and choices
-        @rick, I think this todo van be closed, because exodusmodels.dot is available
-
-* Input fields validation
-* Conversion Genesis -> Exodus
-* Exodus, support Genesis output
 * Add check that a domain has a dnsserver if not, named.conf generation gets broken
 * Add reverse lookup fields for named.conf
 * Fix dhcpd.conf template
 * Add ssh_keys
+* Modular handing/edit/add/delete of Location/DNS/Networks, without using the
+  'admin' interface, but have some table look alike code instead
 
-* remove hardcoding in wllogic.py for 172.17 and higher as master ip 
-* Interface cleanups:
-** option to edit/delete fields
-** allignment input fields
-** combine input fields where possible and link
 ** Interlink add code
         ->desc
-        ->remove hardcoding of 172.16 in freeinterlink ip code
         ->Check if link is possible, ie. master can have multiple interlinks, managed can only have 1
-        ->generate SSID
         ->Put correct modes on NIC
-        ->Check that: freeinterlinkip() works going from 17.16.0.255 to 172.16.1.0
         ->Check if 1 has an omni, omni needs to be master
-        
-
-* Think:
-** class Interlink return self.iface1 or self.iface1.node
 
 * Genesis compatibility

trunk/exodus/templates/freebsd-5.0/dhcpd.conf ¶

@@ -3 +3 @@
 #
 # Generated on {% now "G:i j-n-Y" %} 
-# by {{ object.host }}
+# by {{ node.host }}
 #
-# Node: {{ object.name }}
+# Node: {{ node.name }}
 # File: rc.local
 
-option domain-name "{{ object.network.domainname }}";
 
 default-lease-time 7200;
@@ -15 +14 @@
 ddns-update-style none;
 
-option domain-name-servers {{ object.masterip }};
+option domain-name "{{ node.network }}";
 
-{{object.interface.all}}
-
-{% for nic in object.interface_set.all %}
+{% for nic in node.interface_set.all %}
         {% for omni in nic.omni.all %}
 # {{ omni.desc }}
@@ -27 +24 @@
         option broadcast-address {% broadcast omni.ip omni.netmask %};
         option subnet-mask {{ omni.netmask|subnet }};
+        option domain-name-servers {{ omni.ip }};
 } {% endfor %}
+
 # {{ nic.desc }}
 subnet {% network nic.ip nic.netmask %} netmask {{ nic.netmask|subnet }} { not authoritative; }

trunk/exodus/templates/freebsd-5.0/named.conf ¶

@@ -2 +2 @@
 #
 # Generated on {% now "G:i j-n-Y" %} 
-# by {{ object.host }}
+# by {{ node.host }}
 #
-# Node: {{ object.name }}
+# Node: {{ node.name }}
 # File: named.conf 
 
@@ -11 +11 @@
         pid-file "/var/run/named.pid";
         forwarders {
-        {% for server in object.network.dnsserver_set.all %}
+        {% for server in node.network.dnsserver_set.all %}
         {{server.ipaddress }}; {% endfor %}
         };
@@ -32 +32 @@
 };
 
-{% for domain in object.domains %}
+{#XXX: Needs some rethinking on how to allow this to be called again #}
+{% for domain in node.domains %}
 
 zone "{{domain.domainname}}" {

trunk/exodus/templates/freebsd-5.0/rc.local ¶

@@ -1 +1 @@
 # The file is WirelessLeiden specific. Please make all changes in exodus
 #
-# Generated on {% now "G:i j-n-Y" %} 
-# by {{ object.host }}
+# Generated on {% now "G:i j-n-Y" %}
+# by {{ node.host }}
 #
-# Node: {{ object.name }}
+# Node: {{ node.name }}
 # File: rc.local
 
-{% for nic in object %}
+{% for nic in node.interface_set.all %}
 {% if nic.ssid %}
 /usr/sbin/wicontrol -i {{ nic.iface }} -s {{ nic.shortdesc }} # Nickname

trunk/exodus/templates/freebsd-5.0/rc.node.local ¶

@@ -2 +2 @@
 #
 # Generated on {% now "G:i j-n-Y" %} 
-# by {{ object.host }}
+# by {{ node.host }}
 #
-# Node: {{ object.name }}
-# File: rc.local
+# Node: {{ node.name }}
+# File: rc.node.local
 
-{% for nic in object %}
-{% if nic.ssid %}
-/usr/sbin/wicontrol -i {{ nic.iface }} -s {{ nic.shortdesc }} # Nickname
-/usr/sbin/wicontrol -i {{ nic.iface }} -P 0  # PowerSave
-/usr/sbin/wicontrol -i {{ nic.iface }} -Z    # Zero SNR cache
-/usr/sbin/wicontrol -i {{ nic.iface }} -p {{ nic.wifimode }}  # {{ nic.wifidesc }}
-/usr/sbin/wicontrol -i {{ nic.iface }} -c 1  # broadcasting essid on
-/usr/sbin/wicontrol -i {{ nic.iface }} -n {{ nic.ssid }} # network name
-/usr/sbin/wicontrol -i {{ nic.iface }} -q {{ nic.ssid }} # ESSID
-/usr/sbin/wicontrol -i {{ nic.iface }} -f {{ nic.channel }} # Channel
-{% endif %}
+hostname="{{ node.name }}.{{ node.network }}"
+location="{{ node.location }} - {{ node.location.desc }}"
 
-ifconfig {{nic.iface}} {{nic.ip}}/{{nic.netmask}}
+# Dirty hack for use by WL proxy
+ifconfig_lo0_alias0="172.31.255.1/32"
+# Allow masterip to be linked to lo0 interface to keep it reachable all the time
+ifconfig_lo0_alias1="{{ node.masterip }}/32"
+
+{% for nic in node.interface_set.all %}
+ifconfig_{{ nic.iface }}="inet {{nic.ip}}/{{nic.netmask}}"
 {% endfor %}
 

trunk/exodus/templates/freebsd-5.0/resolv.conf ¶

@@ -3 +3 @@
 #
 # Generated on {% now "G:i j-n-Y" %} 
-# by {{ object.host }}
+# by {{ node.host }}
 #
-# Node: {{ object.name }}
+# Node: {{ node.name }}
 # File: resolv.conf
 
 nameserver 127.0.0.1 #localhost
 {% spaceless %}
-{% for interface in object.interface_set.all %}
+{% for interface in node.interface_set.all %}
         {% for interlink in interface.interface_set.all %}
                 {% ifnotequal interlink interface %}