View | Details | Raw Unified | Return to bug 43778 | Differences between
and this patch

Collapse All | Expand All

(-)a/base/univention-server/univention-fix-ucr-dns (-13 / +12 lines)
 Lines 55-61   def main(): Link Here 
55
	global options
55
	global options
56
	options = parse_args()
56
	options = parse_args()
57
	setup_logging()
57
	setup_logging()
58
	log = getLogger(__name__)
58
	log = getLogger()
59
59
60
	if options.run_tests:
60
	if options.run_tests:
61
		run_tests()
61
		run_tests()
 Lines 143-149   def parse_args(): Link Here 
143
143
144
144
145
def setup_logging():
145
def setup_logging():
146
	FORMAT = '%(asctime)-15s %(levelname)-7s %(name)-17s %(message)s'
146
	FORMAT = '%(asctime)-15s %(levelname)-7s %(name)-8s %(message)s'
147
	LEVELS = [ERROR, WARNING, INFO, DEBUG]
147
	LEVELS = [ERROR, WARNING, INFO, DEBUG]
148
	try:
148
	try:
149
		level = LEVELS[options.verbose]
149
		level = LEVELS[options.verbose]
 Lines 153-159   def setup_logging(): Link Here 
153
153
154
154
155
def get_forwarders(forwarders, ucr):
155
def get_forwarders(forwarders, ucr):
156
	log = getLogger(__name__).getChild('ucr/fwd')
156
	log = getLogger().getChild('ucr/fwd')
157
	log.debug('Reading external DNS forwarders from UCR...')
157
	log.debug('Reading external DNS forwarders from UCR...')
158
158
159
	need_fixing = False
159
	need_fixing = False
 Lines 173-179   def get_forwarders(forwarders, ucr): Link Here 
173
173
174
174
175
def get_nameservers(nameservers, ucr):
175
def get_nameservers(nameservers, ucr):
176
	log = getLogger(__name__).getChild('ucr/ns')
176
	log = getLogger().getChild('ucr/ns')
177
	log.debug('Reading UCS domain servers from UCR...')
177
	log.debug('Reading UCS domain servers from UCR...')
178
178
179
	need_fixing = False
179
	need_fixing = False
 Lines 189-195   def get_nameservers(nameservers, ucr): Link Here 
189
189
190
190
191
def validate_servers(nameservers, forwarders, domain):
191
def validate_servers(nameservers, forwarders, domain):
192
	log = getLogger(__name__).getChild('val')
192
	log = getLogger().getChild('val')
193
	if options.no_validation:
193
	if options.no_validation:
194
		log.info('Skip validation of DNS servers')
194
		log.info('Skip validation of DNS servers')
195
		return False
195
		return False
 Lines 213-219   def validate_servers(nameservers, forwarders, domain): Link Here 
213
213
214
214
215
def either_or(nameservers, forwarders):
215
def either_or(nameservers, forwarders):
216
	log = getLogger(__name__).getChild('xor')
216
	log = getLogger().getChild('xor')
217
	if not options.xor:
217
	if not options.xor:
218
		log.info('Skip removing nameservers from forwarders')
218
		log.info('Skip removing nameservers from forwarders')
219
		return False
219
		return False
 Lines 230-236   def either_or(nameservers, forwarders): Link Here 
230
230
231
231
232
def add_self(nameservers, ucr):
232
def add_self(nameservers, ucr):
233
	log = getLogger(__name__).getChild('ucr/self')
233
	log = getLogger().getChild('ucr/self')
234
	if options.no_self:
234
	if options.no_self:
235
		log.info('Skip adding self')
235
		log.info('Skip adding self')
236
		return
236
		return
 Lines 258-264   def add_self(nameservers, ucr): Link Here 
258
258
259
259
260
def add_nameservers(nameservers, domain):
260
def add_nameservers(nameservers, domain):
261
	log = getLogger(__name__).getChild('ns')
261
	log = getLogger().getChild('ns')
262
	if not options.add_nameservers:
262
	if not options.add_nameservers:
263
		log.info('Skip adding NS')
263
		log.info('Skip adding NS')
264
		return
264
		return
 Lines 286-292   def add_nameservers(nameservers, domain): Link Here 
286
286
287
287
288
def add_master(nameservers, master):
288
def add_master(nameservers, master):
289
	log = getLogger(__name__).getChild('ldap')
289
	log = getLogger().getChild('ldap')
290
	if not options.add_master:
290
	if not options.add_master:
291
		log.info('Skip adding master')
291
		log.info('Skip adding master')
292
		return
292
		return
 Lines 311-317   def add_master(nameservers, master): Link Here 
311
311
312
312
313
def update_ucr(ucr, nameservers, forwarders):
313
def update_ucr(ucr, nameservers, forwarders):
314
	log = getLogger(__name__).getChild('ucr')
314
	log = getLogger().getChild('ucr')
315
	new_ucr_settings = {}
315
	new_ucr_settings = {}
316
316
317
	def update(names, values, typ):
317
	def update(names, values, typ):
 Lines 341-347   def update_ucr(ucr, nameservers, forwarders): Link Here 
341
341
342
342
343
def query_master_src_record(domain, server):
343
def query_master_src_record(domain, server):
344
	log = getLogger(__name__).getChild('dns/srv')
344
	log = getLogger().getChild('dns/srv')
345
345
346
	rec = '_domaincontroller_master._tcp.%s.' % (domain.rstrip('.'),)
346
	rec = '_domaincontroller_master._tcp.%s.' % (domain.rstrip('.'),)
347
	log.debug('Querying %s for SRV %s', server, rec)
347
	log.debug('Querying %s for SRV %s', server, rec)
 Lines 381-387   def is_self(addr): Link Here 
381
	>>> is_self('8.8.8.8')
381
	>>> is_self('8.8.8.8')
382
	False
382
	False
383
	"""
383
	"""
384
	log = getLogger(__name__).getChild('ip')
384
	log = getLogger().getChild('ip')
385
385
386
	env = dict(environ)
386
	env = dict(environ)
387
	env['LC_ALL'] = 'C'
387
	env['LC_ALL'] = 'C'
388
- 

Return to bug 43778