diff --git a/.etckeeper b/.etckeeper index e981f630..f9fdb821 100755 --- a/.etckeeper +++ b/.etckeeper @@ -3100,8 +3100,6 @@ maybe chmod 0644 'python2.7/sitecustomize.py' maybe chmod 0755 'python3' maybe chmod 0755 'python3.11' maybe chmod 0644 'python3.11/sitecustomize.py' -maybe chmod 0755 'python3.9' -maybe chmod 0644 'python3.9/sitecustomize.py' maybe chmod 0644 'python3/debian_config' maybe chmod 0755 'qemu' maybe chmod 0755 'qemu/fsfreeze-hook' diff --git a/default/ntpdate b/default/ntpdate index 3241694e..c3e2083c 100644 --- a/default/ntpdate +++ b/default/ntpdate @@ -7,7 +7,7 @@ NTPDATE_USE_NTP_CONF=yes # List of NTP servers to use (Separate multiple servers with spaces.) # Not used if NTPDATE_USE_NTP_CONF is yes. -NTPSERVERS="0.debian.pool.ntp.org 1.debian.pool.ntp.org 2.debian.pool.ntp.org 3.debian.pool.ntp.org" +#NTPSERVERS="0.debian.pool.ntp.org 1.debian.pool.ntp.org 2.debian.pool.ntp.org 3.debian.pool.ntp.org" # Additional options to pass to ntpdate NTPOPTIONS="" diff --git a/default/ntpsec-ntpdate b/default/ntpsec-ntpdate index 8e229641..af81d696 100644 --- a/default/ntpsec-ntpdate +++ b/default/ntpsec-ntpdate @@ -7,7 +7,7 @@ NTPDATE_USE_NTP_CONF=yes # List of NTP servers to use (Separate multiple servers with spaces.) # Not used if NTPDATE_USE_NTP_CONF is yes. -NTPSERVERS="0.debian.pool.ntp.org 1.debian.pool.ntp.org 2.debian.pool.ntp.org 3.debian.pool.ntp.org" +#NTPSERVERS="0.debian.pool.ntp.org 1.debian.pool.ntp.org 2.debian.pool.ntp.org 3.debian.pool.ntp.org" # Additional options to pass to ntpdate NTPOPTIONS="" diff --git a/nginx/modules-enabled/50-mod-http-geoip.conf.removed b/nginx/modules-enabled/50-mod-http-geoip.conf.removed deleted file mode 120000 index 390fab28..00000000 --- a/nginx/modules-enabled/50-mod-http-geoip.conf.removed +++ /dev/null @@ -1 +0,0 @@ -/usr/share/nginx/modules-available/mod-http-geoip.conf \ No newline at end of file diff --git a/nginx/modules-enabled/50-mod-http-image-filter.conf.removed b/nginx/modules-enabled/50-mod-http-image-filter.conf.removed deleted file mode 120000 index fa27cd31..00000000 --- a/nginx/modules-enabled/50-mod-http-image-filter.conf.removed +++ /dev/null @@ -1 +0,0 @@ -/usr/share/nginx/modules-available/mod-http-image-filter.conf \ No newline at end of file diff --git a/nginx/modules-enabled/50-mod-http-xslt-filter.conf.removed b/nginx/modules-enabled/50-mod-http-xslt-filter.conf.removed deleted file mode 120000 index 51d7ca77..00000000 --- a/nginx/modules-enabled/50-mod-http-xslt-filter.conf.removed +++ /dev/null @@ -1 +0,0 @@ -/usr/share/nginx/modules-available/mod-http-xslt-filter.conf \ No newline at end of file diff --git a/nginx/modules-enabled/50-mod-mail.conf.removed b/nginx/modules-enabled/50-mod-mail.conf.removed deleted file mode 120000 index baa6ea94..00000000 --- a/nginx/modules-enabled/50-mod-mail.conf.removed +++ /dev/null @@ -1 +0,0 @@ -/usr/share/nginx/modules-available/mod-mail.conf \ No newline at end of file diff --git a/ntp.conf b/ntp.conf index 3facac41..c9c3d489 100644 --- a/ntp.conf +++ b/ntp.conf @@ -20,14 +20,9 @@ filegen clockstats file clockstats type day enable # pool.ntp.org maps to about 1000 low-stratum NTP servers. Your server will # pick a different set every time it starts up. Please consider joining the # pool: -#pool 0.debian.pool.ntp.org iburst -#pool 1.debian.pool.ntp.org iburst -#pool 2.debian.pool.ntp.org iburst -#pool 3.debian.pool.ntp.org iburst -server 0.de.pool.ntp.org -server 1.de.pool.ntp.org -server 2.de.pool.ntp.org -server 3.de.pool.ntp.org +server ptbtime1.ptb.de +server ptbtime2.ptb.de +server ptbtime3.ptb.de # Access control configuration; see /usr/share/doc/ntp-doc/html/accopt.html for diff --git a/ntpsec/ntp.conf b/ntpsec/ntp.conf index 66d3c290..c502d467 100644 --- a/ntpsec/ntp.conf +++ b/ntpsec/ntp.conf @@ -31,10 +31,9 @@ tos minclock 4 minsane 3 # pool.ntp.org maps to about 1000 low-stratum NTP servers. Your server will # pick a different set every time it starts up. Please consider joining the # pool: -pool 0.debian.pool.ntp.org iburst -pool 1.debian.pool.ntp.org iburst -pool 2.debian.pool.ntp.org iburst -pool 3.debian.pool.ntp.org iburst +server ptbtime1.ptb.de +server ptbtime2.ptb.de +server ptbtime3.ptb.de # Access control configuration; see /usr/share/doc/ntpsec-doc/html/accopt.html # for details. diff --git a/python3.9/sitecustomize.py b/python3.9/sitecustomize.py deleted file mode 100644 index 89c67120..00000000 --- a/python3.9/sitecustomize.py +++ /dev/null @@ -1,7 +0,0 @@ -# install the apport exception handler if available -try: - import apport_python_hook -except ImportError: - pass -else: - apport_python_hook.install()