View | Details | Raw Unified | Return to bug 43748
Collapse All | Expand All

(-)a/ucs-school-import/usr/share/ucs-school-import/scripts/ucs-school-import (+1 lines)
Lines 809-814 def verify_school_ou(schoolNr, co, lo, baseDN, dcName=None, ShareFileServer=None Link Here
809 
		if not service_exists:
 809 
		if not service_exists:
810 
			position.setDn("cn=dhcp,%s" % (getDN(schoolNr), ))
 810 
			position.setDn("cn=dhcp,%s" % (getDN(schoolNr), ))
811 
			object = dhcp_service_module.object(co, lo, position=position, superordinate=superordinate)
 811 
			object = dhcp_service_module.object(co, lo, position=position, superordinate=superordinate)
812 
			object.options.append('options')
812 
			object.open()
 813 
			object.open()
813 
			object["service"] = schoolNr.lower()
 814 
			object["service"] = schoolNr.lower()
814 
			object['option'] = ['wpad "http://%s.%s/proxy.pac"' % (dccn, domainname)]
 815 
			object['option'] = ['wpad "http://%s.%s/proxy.pac"' % (dccn, domainname)]
(-)a/ucs-school-lib/python/models/dhcp.py (+1 lines)
Lines 45-50 class DHCPService(UCSSchoolHelperAbstractClass): Link Here
45 
	domainname = Attribute(_('Domain'))
 45 
	domainname = Attribute(_('Domain'))
46 

          46
          

        

        

          47
          
	def do_create(self, udm_obj, lo):

          47
          
	def do_create(self, udm_obj, lo):

        

            

              
              
              48
              
		udm_obj.options.append('options')

            

        

          48
          
		udm_obj['option'] = ['wpad "http://%s.%s/proxy.pac"' % (self.hostname, self.domainname)]

          49
          
		udm_obj['option'] = ['wpad "http://%s.%s/proxy.pac"' % (self.hostname, self.domainname)]

        

        

          49
          
		return super(DHCPService, self).do_create(udm_obj, lo)

          50
          
		return super(DHCPService, self).do_create(udm_obj, lo)

        

        

          50
          

          51
          

        






  

  Return to bug 43748