Changeset 6192

Timestamp:

Aug 14, 2008, 9:48:49 PM (17 years ago)

Author:

RIck van der Zwet

Message:

• Fixed linking to various config files
• Initial dhcpd file attempt

Location:

exodus

Files:

• templates/dhcpd.conf (copied) (copied from exodus/templates/rc-node-local.txt ) (1 diff)
• templates/node-list.html (modified) (1 diff)
• urls.py (modified) (1 diff)
• views.py (modified) (5 diffs)

exodus/templates/dhcpd.conf

@@ -7 +7 @@
 # File: rc.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 %}
+option domain-name "{{ object.network.domainname }}";
+
+default-lease-time 7200;
+max-lease-time 2592000;
+
+ddns-update-style none;
+
+option domain-name-servers {{ object.masterip }};
+
+{% for nic in object.nic %}
+        # {{ nic.iface }} {{ nic.desc }}
+        
 {% endfor %}

exodus/templates/node-list.html

@@ -13 +13 @@
             <td><a href=../{{ object.name }}/named.conf/>named.conf</a></td>
             <td><a href=../{{ object.name }}/rc.node.local/>rc.node.local</a></td>
-            <td><a href=../{{ object.name }}/resolve.conf/>resolv.conf</a></td>
+            <td><a href=../{{ object.name }}/resolv.conf/>resolv.conf</a></td>
                 </tr>
 

exodus/urls.py

@@ -18 +18 @@
 
         # config urls
-        (r'^(?P<object_id>.+)/dhcp.conf/$', 'exodus.views.conf_dhcp_conf'),
+        (r'^(?P<object_id>.+)/dhcpd.conf/$', 'exodus.views.conf_dhcpd_conf'),
         (r'^(?P<object_id>.+)/named.conf/$', 'exodus.views.conf_named_conf'),
         (r'^(?P<object_id>.+)/rc.node.local/$', 'exodus.views.conf_rc_node_local'),

exodus/views.py

@@ -155 +155 @@
         return render_to_response('addomni.html',{'form1':form1, 'form2':form2})
 
+def nodename_to_id(node):
+        """Convert node name to ID if found in the database"""
+        try:
+                return Node.objects.get(name=node).id
+        except Node.DoesNotExist:
+                # Most likely valid id already
+                return node
     
+def conf_generator(node, template):
+        object_id = nodename_to_id(node)
+        object = Node.objects.get(pk=object_id)
+
+        #Some extra values for statictics info
+        object.date = datetime.now()
+        object.name = Node.objects.get(pk=object_id).name
+        object.host = gethostname()
+        object.nic = object.nic_set.all()
+
+        t = loader.get_template(template)
+        c = Context({'object': object})
+        return HttpResponse(t.render(c), mimetype='text/plain')
+
+def conf_dhcpd_conf(request, object_id):
+        """isc-dhcpd-3-server conf generator"""
+        return conf_generator(object_id, 'dhcpd.conf')
+
 
 def conf_rc_local(request, object_id):
     """5.X legacy rc.local conf generator"""
 
-    object = Node.objects.get(pk=object_id).nic_set.all()
+    object_id = nodename_to_id(object_id)
+    object = Node.objects.get(pk=object_id)
     object.date = datetime.now()
     object.name = Node.objects.get(pk=object_id).name
@@ -182 +208 @@
         """5.X Legacy rc.node.local conf generator"""
 
+        object_id = nodename_to_id(object_id)
+
         object.date = datetime.now()
         object.name = Node.objects.get(pk=object_id).name
@@ -194 +222 @@
         """rc.node.local conf generator"""
         
-        #Convert Node name -> id
-        try:
-                object_id = Node.objects.get(name=object_id).id
-        except Node.DoesNotExist:
-                pass # Most likely valid id already
+        object_id = nodename_to_id(object_id)
         
         object = Node.objects.get(pk=object_id).nic_set.all()
@@ -214 +238 @@
         """rc.node.local conf generator"""
                 
-
+        object_id = nodename_to_id(object_id)
+        
         object = Node.objects.get(pk=object_id).nic_set.all()
         object.date = datetime.now()
@@ -235 +260 @@
                 })
         return HttpResponse(t.render(c), mimetype='text/plain')
+