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

(-)samba3upgrade/smb.conf.d/51univention-samba_domain (-4 / +10 lines)
 Lines 48-58    Link Here 
48 
	print '\tdomain master = no'
 48 
	print '\tdomain master = no'
49 
	print '\tpreferred master = no'
 49 
	print '\tpreferred master = no'
50 
	print '\tlocal master = no'
 50 
	print '\tlocal master = no'
51 
@!@
52 

          51
          

        

          
            

              53
              
	os level = @%@samba/os/level@%@


              52
              
print '\trealm = %s' % configRegistry.get('kerberos/realm')

            

            

              54
              
	wins support = @%@windows/wins-support@%@


              53
              

            

            

              55
              
@!@


              54
              
samba_os_level = configRegistry.get('samba/os/level')

            

            

              
              

              55
              
if samba_os_level:

            

            


              56
              
	print '\tos level = %s' % samba_os_level

            

            


              57
              

            

            


              58
              
wins_support = configRegistry.get('windows/wins-support')

            

            


              59
              
if wins_support:

            

            


              60
              
	print '\twins support = %s' % wins_support

            

            


              61
              

            

        

          56
          
if configRegistry['windows/wins-support'] != 'yes' and configRegistry['windows/wins-server']:

          62
          
if configRegistry['windows/wins-support'] != 'yes' and configRegistry['windows/wins-server']:

        

        

          57
          
	print '	wins server = %s' % configRegistry['windows/wins-server'],

          63
          
	print '	wins server = %s' % configRegistry['windows/wins-server'],

        

        

          58
          
@!@

          64
          
@!@

        



(-)samba3upgrade/smb.conf.d/91univention-samba_shares
      (-2 / +6 lines)




  

    

    

       Lines 1-4
       
    
  Link Here 
    

  

        

          1
          

          1
          

        

        

          2
          
; -----------------------------------------------------------------------------------------------------------

          2
          
; -----------------------------------------------------------------------------------------------------------

        

          
            

              3
              
	include = /etc/samba/base.conf


              3
              
@!@

            

            

              4
              
	include = /etc/samba/installs.conf


              4
              
import os

            

            

              
              

              5
              
for includefilepath in ('/etc/samba/base.conf', '/etc/samba/installs.conf'):

            

            


              6
              
	if os.path.exists(includefilepath):

            

            


              7
              
		print "\tinclude =", includefilepath

            

            


              8
              
@!@

            



(-)samba3upgrade/smb.conf.d/92univention-samba_shares
      (-3 / +6 lines)




  

    

    

       Lines 1-3
       
    
  Link Here 
    

  

          
            

              1
              


              1
              
@!@

            

            

              2
              
	include = /etc/samba/shares.conf


              2
              
import os

            

            

              3
              
	include = /etc/samba/printers.conf


              3
              
for includefilepath in ('/etc/samba/shares.conf', '/etc/samba/printers.conf'):

            

            

              
              

              4
              
	if os.path.exists(includefilepath):

            

            


              5
              
		print "\tinclude =", includefilepath

            

            


              6
              
@!@

            



(-)samba3upgrade/smb.conf.d/99univention-samba_local_shares
      (-3 / +6 lines)




  

    

    

       Lines 1-3
       
    
  Link Here 
    

  

          
            

              1
              


              1
              
@!@

            

            

              2
              
    include = /etc/samba/local.conf


              2
              
import os

            

            

              3
              


              3
              
for includefilepath in ('/etc/samba/local.conf', ):

            

            

              
              

              4
              
	if os.path.exists(includefilepath):

            

            


              5
              
		print "\tinclude =", includefilepath

            

            


              6
              
@!@

            



(-)scripts/setup-s4.sh
      (-1 lines)




  

    

    

       Lines 277-283
       
    
  Link Here 
    

  

        

          277
          
	cat /usr/share/univention-samba4/samba3upgrade/smb.conf.d/* | ucr filter > /var/lib/samba3/etc/samba/smb.conf

          277
          
	cat /usr/share/univention-samba4/samba3upgrade/smb.conf.d/* | ucr filter > /var/lib/samba3/etc/samba/smb.conf

        

        

          278
          
	## fix up /var/lib/samba3/smb.conf for samba-tool

          278
          
	## fix up /var/lib/samba3/smb.conf for samba-tool

        

        

          279
          
	touch /etc/samba/base.conf /etc/samba/installs.conf /etc/samba/printers.conf /etc/samba/shares.conf

          279
          
	touch /etc/samba/base.conf /etc/samba/installs.conf /etc/samba/printers.conf /etc/samba/shares.conf

        

            

              280
              
	echo -e "[global]\n\trealm = $kerberos_realm" >> /var/lib/samba3/etc/samba/smb.conf

              
              
            

        

          281
          

          280
          

        

        

          282
          
	# The upgrade tool uses /var/lib/samba3/ for these files

          281
          
	# The upgrade tool uses /var/lib/samba3/ for these files

        

        

          283
          
	#  https://forge.univention.org/bugzilla/show_bug.cgi?id=33251

          282
          
	#  https://forge.univention.org/bugzilla/show_bug.cgi?id=33251

        






  

  Return to bug 36395