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

Collapse All | Expand All

(-)doc/doc-common (-1 / +1 lines)
Line 1    Link Here 
1 
Subproject commit 3595845cf08fbcdd2ec1440dfe0757c671b45715
 1 
Subproject commit 5dc4ea65f95535aa2b6986463cad9e90d158244c
(-)services/univention-samba4/conffiles/etc/samba/smb.conf.d/61univention-samba_misc (+1 lines)
 Lines 56-60   if configRegistry.get('samba4/service/smb', 'smbd') in ('smbd', 's3fs'): Link Here 
56 

          56
          

        

        

          57
          
	print('\tpreserve case = %s' % configRegistry.get('samba/preserve_case', 'yes'))

          57
          
	print('\tpreserve case = %s' % configRegistry.get('samba/preserve_case', 'yes'))

        

        

          58
          
	print('\tshort preserve case = %s' % configRegistry.get('samba/short_preserve_case', 'yes'))

          58
          
	print('\tshort preserve case = %s' % configRegistry.get('samba/short_preserve_case', 'yes'))

        

            

              
              
              59
              
	print('\tkdc:user ticket lifetime = 20')

            

        

          59
          

          60
          

        

        

          60
          
@!@

          61
          
@!@

        



(-)services/univention-squid/conffiles/etc/squid/squid.conf
      (+2 lines)




  

    

    

       Lines 66-71
      if configRegistry.is_false('squid/cache'): 
    
  Link Here 
    

  

        

          66
          

          66
          

        

        

          67
          
transparent = 'transparent' if configRegistry.is_true('squid/transparentproxy') else ''

          67
          
transparent = 'transparent' if configRegistry.is_true('squid/transparentproxy') else ''

        

        

          68
          
print("http_port %d %s" % (int(configRegistry.get('squid/httpport', 3128)), transparent))

          68
          
print("http_port %d %s" % (int(configRegistry.get('squid/httpport', 3128)), transparent))

        

            

              
              
              69
              
if transparent:

            

            

              70
              
	print("http_port %d" % (int(configRegistry.get('squid/httpport', 3128)+1)))

            

        

          69
          

          71
          

        

        

          70
          
print('')

          72
          
print('')

        

        

          71
          

          73
          

        



(-)test/product-tests/domain-join/ubuntu-20.04.cfg
      (-2 / +3 lines)




  

    

    

       Lines 30-35
      command1: 
    
  Link Here 
    

  

        

          30
          
 . utils.sh && basic_setup

          30
          
 . utils.sh && basic_setup

        

        

          31
          
 . utils.sh && basic_setup_ucs_role [master_IP]

          31
          
 . utils.sh && basic_setup_ucs_role [master_IP]

        

        

          32
          
 . utils.sh && import_license

          32
          
 . utils.sh && import_license

        

            

              
              
              33
              
 ucr set repository/online/server="http://updates-test.software-univention.de"

            

        

          33
          
 . utils.sh && jenkins_updates

          34
          
 . utils.sh && jenkins_updates

        

        

          34
          
command2:

          35
          
command2:

        

        

          35
          
 SNAPSHOT before tests

          36
          
 SNAPSHOT before tests

        

  

    

    

       Lines 51-60
      kvm_architecture: amd64 
    
  Link Here 
    

  

        

          51
          
kvm_operating_system: Others

          52
          
kvm_operating_system: Others

        

        

          52
          
command1:

          53
          
command1:

        

        

          53
          
 . utils.sh && add_tech_key_authorized_keys

          54
          
 . utils.sh && add_tech_key_authorized_keys

        

          
            

              54
              
 . product-tests/domain-join/domain-join.sh && install_domain_join "[ENV:COMPONENT_VERSION]" "ubuntu20.04"


              55
              
 . product-tests/domain-join/domain-join.sh && install_domain_join "public" "ubuntu20.04"

            

        

          55
          
command2:

          56
          
command2:

        

        

          56
          
 SNAPSHOT before tests

          57
          
 SNAPSHOT before tests

        

          
            

              57
              
 . product-tests/domain-join/domain-join.sh && run_tests "[ENV:UCS_TEST_RUN]" "[master_IP]" Administrator univention testuser123 tester univention1 univention


              58
              
# . product-tests/domain-join/domain-join.sh && run_tests "[ENV:UCS_TEST_RUN]" "[master_IP]" Administrator univention testuser123 tester univention1 univention

            

        

          58
          
command3:

          59
          
command3:

        

        

          59
          
command4:

          60
          
command4:

        

        

          60
          
 . utils.sh && prepare_results

          61
          
 . utils.sh && prepare_results

        



(-)test/scenarios/ad-connector/autotest-237-adsync-s4connector-w2k19-english.cfg
      (-1 / +2 lines)




  

    

    

       Lines 32-44
      profile: 
    
  Link Here 
    

  

        

          32
          
 ldap/base="dc=autotest237,dc=local"

          32
          
 ldap/base="dc=autotest237,dc=local"

        

        

          33
          
 root_password="univention"

          33
          
 root_password="univention"

        

        

          34
          
 locale/default="de_DE.UTF-8:UTF-8"

          34
          
 locale/default="de_DE.UTF-8:UTF-8"

        

          
            

              35
              
 packages_install="univention-ad-connector univention-s4-connector univention-samba4"


              35
              
 packages_install="univention-s4-connector univention-samba4 univention-ad-connector"

            

        

          36
          
 packages_remove=""

          36
          
 packages_remove=""

        

        

          37
          
 server/role="domaincontroller_master"

          37
          
 server/role="domaincontroller_master"

        

        

          38
          
command1:

          38
          
command1:

        

        

          39
          
 . utils.sh; winrm_config "autotest237win.local" "[ENV:win2k19237_PASSWORD]" "Administrator" "[ENV:win2k19237_IP]"

          39
          
 . utils.sh; winrm_config "autotest237win.local" "[ENV:win2k19237_PASSWORD]" "Administrator" "[ENV:win2k19237_IP]"

        

        

          40
          
 . utils.sh; basic_setup

          40
          
 . utils.sh; basic_setup

        

        

          41
          
 . utils.sh; rotate_logfiles

          41
          
 . utils.sh; rotate_logfiles

        

            

              
              
              42
              
 ucr set repository/online/server="http://updates-test.software-univention.de"

            

        

          42
          
 . utils.sh; jenkins_updates

          43
          
 . utils.sh; jenkins_updates

        

        

          43
          
 . utils.sh; run_setup_join

          44
          
 . utils.sh; run_setup_join

        

        

          44
          
 . utils.sh; do_reboot

          45
          
 . utils.sh; do_reboot

        



(-)test/scenarios/autotest-090-master-no-samba.cfg
      (+1 lines)




  

    

    

       Lines 51-56
      command1: 
    
  Link Here 
    

  

        

          51
          
 . utils.sh; basic_setup

          51
          
 . utils.sh; basic_setup

        

        

          52
          
 . utils.sh; add_tech_key_authorized_keys

          52
          
 . utils.sh; add_tech_key_authorized_keys

        

        

          53
          
 . utils.sh; rotate_logfiles

          53
          
 . utils.sh; rotate_logfiles

        

            

              
              
              54
              
 ucr set repository/online/server="http://updates-test.software-univention.de"

            

        

          54
          
 . utils.sh; jenkins_updates

          55
          
 . utils.sh; jenkins_updates

        

        

          55
          
 . utils.sh; run_setup_join

          56
          
 . utils.sh; run_setup_join

        

        

          56
          
 # HOTFIX: about to be removed soon

          57
          
 # HOTFIX: about to be removed soon

        



(-)test/scenarios/autotest-096-member-no-samba.cfg
      (+2 lines)




  

    

    

       Lines 50-55
      command1: 
    
  Link Here 
    

  

        

          50
          
 . utils.sh; basic_setup

          50
          
 . utils.sh; basic_setup

        

        

          51
          
 . utils.sh; add_tech_key_authorized_keys

          51
          
 . utils.sh; add_tech_key_authorized_keys

        

        

          52
          
 . utils.sh; rotate_logfiles

          52
          
 . utils.sh; rotate_logfiles

        

            

              
              
              53
              
 ucr set repository/online/server="http://updates-test.software-univention.de"

            

        

          53
          
 ASYNC . utils.sh; jenkins_updates

          54
          
 ASYNC . utils.sh; jenkins_updates

        

        

          54
          
command2:

          55
          
command2:

        

        

          55
          
 . utils.sh; run_setup_join

          56
          
 . utils.sh; run_setup_join

        

  

    

    

       Lines 82-87
      command1: 
    
  Link Here 
    

  

        

          82
          
 . utils.sh; basic_setup

          83
          
 . utils.sh; basic_setup

        

        

          83
          
 . utils.sh; add_tech_key_authorized_keys

          84
          
 . utils.sh; add_tech_key_authorized_keys

        

        

          84
          
 . utils.sh; rotate_logfiles

          85
          
 . utils.sh; rotate_logfiles

        

            

              
              
              86
              
 ucr set repository/online/server="http://updates-test.software-univention.de"

            

        

          85
          
 ASYNC . utils.sh; jenkins_updates

          87
          
 ASYNC . utils.sh; jenkins_updates

        

        

          86
          
command2:

          88
          
command2:

        

        

          87
          
 . utils.sh; run_setup_join_on_non_master

          89
          
 . utils.sh; run_setup_join_on_non_master

        






  

  Return to bug 53011