Attachment 10677 Details for Bug 53011

[patch] squid.conf patch

squid.patch (text/plain), 5.19 KB, created by Julia Bremer on 2021-03-31 14:15 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Julia Bremer

Created: 2021-03-31 14:15 CEST

Size: 5.19 KB

patch

obsolete

>diff --git doc/doc-common doc/doc-common
>index 3595845cf0..5dc4ea65f9 160000
>--- doc/doc-common
>+++ doc/doc-common
>@@ -1 +1 @@
>-Subproject commit 3595845cf08fbcdd2ec1440dfe0757c671b45715
>+Subproject commit 5dc4ea65f95535aa2b6986463cad9e90d158244c
>diff --git services/univention-samba4/conffiles/etc/samba/smb.conf.d/61univention-samba_misc services/univention-samba4/conffiles/etc/samba/smb.conf.d/61univention-samba_misc
>index 73ba758ce4..b3738aee5a 100644
>--- services/univention-samba4/conffiles/etc/samba/smb.conf.d/61univention-samba_misc
>+++ services/univention-samba4/conffiles/etc/samba/smb.conf.d/61univention-samba_misc
>@@ -56,5 +56,6 @@ if configRegistry.get('samba4/service/smb', 'smbd') in ('smbd', 's3fs'):
> 
> 	print('\tpreserve case = %s' % configRegistry.get('samba/preserve_case', 'yes'))
> 	print('\tshort preserve case = %s' % configRegistry.get('samba/short_preserve_case', 'yes'))
>+	print('\tkdc:user ticket lifetime = 20')
> 
> @!@
>diff --git services/univention-squid/conffiles/etc/squid/squid.conf services/univention-squid/conffiles/etc/squid/squid.conf
>index 6ae51d6bf4..208fd870a4 100644
>--- services/univention-squid/conffiles/etc/squid/squid.conf
>+++ services/univention-squid/conffiles/etc/squid/squid.conf
>@@ -66,6 +66,8 @@ if configRegistry.is_false('squid/cache'):
> 
> transparent = 'transparent' if configRegistry.is_true('squid/transparentproxy') else ''
> print("http_port %d %s" % (int(configRegistry.get('squid/httpport', 3128)), transparent))
>+if transparent:
>+	print("http_port %d" % (int(configRegistry.get('squid/httpport', 3128)+1)))
> 
> print('')
> 
>diff --git test/product-tests/domain-join/ubuntu-20.04.cfg test/product-tests/domain-join/ubuntu-20.04.cfg
>index 330fa4ae6c..97ec2b6b08 100644
>--- test/product-tests/domain-join/ubuntu-20.04.cfg
>+++ test/product-tests/domain-join/ubuntu-20.04.cfg
>@@ -30,6 +30,7 @@ command1:
>  . utils.sh && basic_setup
>  . utils.sh && basic_setup_ucs_role [master_IP]
>  . utils.sh && import_license
>+ ucr set repository/online/server="http://updates-test.software-univention.de"
>  . utils.sh && jenkins_updates
> command2:
>  SNAPSHOT before tests
>@@ -51,10 +52,10 @@ kvm_architecture: amd64
> kvm_operating_system: Others
> command1:
>  . utils.sh && add_tech_key_authorized_keys
>- . product-tests/domain-join/domain-join.sh && install_domain_join "[ENV:COMPONENT_VERSION]" "ubuntu20.04"
>+ . product-tests/domain-join/domain-join.sh && install_domain_join "public" "ubuntu20.04"
> command2:
>  SNAPSHOT before tests
>- . product-tests/domain-join/domain-join.sh && run_tests "[ENV:UCS_TEST_RUN]" "[master_IP]" Administrator univention testuser123 tester univention1 univention
>+# . product-tests/domain-join/domain-join.sh && run_tests "[ENV:UCS_TEST_RUN]" "[master_IP]" Administrator univention testuser123 tester univention1 univention
> command3:
> command4:
>  . utils.sh && prepare_results
>diff --git test/scenarios/ad-connector/autotest-237-adsync-s4connector-w2k19-english.cfg test/scenarios/ad-connector/autotest-237-adsync-s4connector-w2k19-english.cfg
>index 05630085d6..9e92362a8e 100644
>--- test/scenarios/ad-connector/autotest-237-adsync-s4connector-w2k19-english.cfg
>+++ test/scenarios/ad-connector/autotest-237-adsync-s4connector-w2k19-english.cfg
>@@ -32,13 +32,14 @@ profile:
>  ldap/base="dc=autotest237,dc=local"
>  root_password="univention"
>  locale/default="de_DE.UTF-8:UTF-8"
>- packages_install="univention-ad-connector univention-s4-connector univention-samba4"
>+ packages_install="univention-s4-connector univention-samba4 univention-ad-connector"
>  packages_remove=""
>  server/role="domaincontroller_master"
> command1:
>  . utils.sh; winrm_config "autotest237win.local" "[ENV:win2k19237_PASSWORD]" "Administrator" "[ENV:win2k19237_IP]"
>  . utils.sh; basic_setup
>  . utils.sh; rotate_logfiles
>+ ucr set repository/online/server="http://updates-test.software-univention.de"
>  . utils.sh; jenkins_updates
>  . utils.sh; run_setup_join
>  . utils.sh; do_reboot
>diff --git test/scenarios/autotest-090-master-no-samba.cfg test/scenarios/autotest-090-master-no-samba.cfg
>index e495dba91c..be229a6f3a 100644
>--- test/scenarios/autotest-090-master-no-samba.cfg
>+++ test/scenarios/autotest-090-master-no-samba.cfg
>@@ -51,6 +51,7 @@ command1:
>  . utils.sh; basic_setup
>  . utils.sh; add_tech_key_authorized_keys
>  . utils.sh; rotate_logfiles
>+ ucr set repository/online/server="http://updates-test.software-univention.de"
>  . utils.sh; jenkins_updates
>  . utils.sh; run_setup_join
>  # HOTFIX: about to be removed soon
>diff --git test/scenarios/autotest-096-member-no-samba.cfg test/scenarios/autotest-096-member-no-samba.cfg
>index 36b5bc0a3e..4adac153a4 100644
>--- test/scenarios/autotest-096-member-no-samba.cfg
>+++ test/scenarios/autotest-096-member-no-samba.cfg
>@@ -50,6 +50,7 @@ command1:
>  . utils.sh; basic_setup
>  . utils.sh; add_tech_key_authorized_keys
>  . utils.sh; rotate_logfiles
>+ ucr set repository/online/server="http://updates-test.software-univention.de"
>  ASYNC . utils.sh; jenkins_updates
> command2:
>  . utils.sh; run_setup_join
>@@ -82,6 +83,7 @@ command1:
>  . utils.sh; basic_setup
>  . utils.sh; add_tech_key_authorized_keys
>  . utils.sh; rotate_logfiles
>+ ucr set repository/online/server="http://updates-test.software-univention.de"
>  ASYNC . utils.sh; jenkins_updates
> command2:
>  . utils.sh; run_setup_join_on_non_master

Actions: View | Diff

Attachments on bug 53011: 10677 | 10678