From ab99ee48043f512f8adf32fac58fd84af51eb299 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 12 Nov 2018 06:26:49 +0100 Subject: [PATCH] daily autocommit --- .etckeeper | 5 +++- default/amavisd-milter | 6 ++-- dovecot/dovecot-sql.conf | 20 +++++++++++++ dovecot/dovecot.conf | 1 + group | 2 +- group- | 1 + gshadow | 2 +- gshadow- | 1 + myssl/dh2048.pem | 12 ++++---- opendmarc.conf | 13 ++++++-- opendmarc/ignore.hosts | 1 + postfix/main.cf | 1 + webmin/authentic-theme/settings-root | 44 ++++++++++++++++++++++++++++ webmin/bandwidth/config | 2 +- webmin/bind8/zone-names | 10 +++++-- webmin/config | 12 ++++++++ webmin/miniserv.conf | 1 + webmin/miniserv.users | 2 +- webmin/proc/index | 1 + webmin/webmin/config | 2 +- 20 files changed, 119 insertions(+), 20 deletions(-) create mode 100644 opendmarc/ignore.hosts create mode 100644 webmin/authentic-theme/settings-root create mode 100644 webmin/proc/index diff --git a/.etckeeper b/.etckeeper index 723e7e72a..69cceca09 100755 --- a/.etckeeper +++ b/.etckeeper @@ -40,7 +40,6 @@ mkdir -p './udev/hwdb.d' mkdir -p './udev/rules.d' mkdir -p './ufw/applications.d/apache2' mkdir -p './update-manager/release-upgrades.d' -mkdir -p './webmin/authentic-theme' maybe chmod 0755 '.' maybe chmod 0700 '.etckeeper' maybe chmod 0600 '.gitignore' @@ -1325,7 +1324,9 @@ maybe chmod 0640 'opendkim/keys/key1.private' maybe chmod 0600 'opendkim/keys/key1.txt' maybe chmod 0644 'opendkim/keytable' maybe chmod 0644 'opendkim/signingtable' +maybe chmod 0755 'opendmarc' maybe chmod 0644 'opendmarc.conf' +maybe chmod 0644 'opendmarc/ignore.hosts' maybe chmod 0755 'opt' maybe chmod 0644 'pam.conf' maybe chmod 0755 'pam.d' @@ -1661,6 +1662,7 @@ maybe chmod 0711 'webmin/at' maybe chgrp 'bin' 'webmin/at/config' maybe chmod 0600 'webmin/at/config' maybe chmod 0755 'webmin/authentic-theme' +maybe chmod 0644 'webmin/authentic-theme/settings-root' maybe chgrp 'bin' 'webmin/backup-config' maybe chmod 0711 'webmin/backup-config' maybe chgrp 'bin' 'webmin/backup-config/config' @@ -1972,6 +1974,7 @@ maybe chgrp 'bin' 'webmin/proc' maybe chmod 0711 'webmin/proc' maybe chgrp 'bin' 'webmin/proc/config' maybe chmod 0600 'webmin/proc/config' +maybe chmod 0644 'webmin/proc/index' maybe chgrp 'bin' 'webmin/procmail' maybe chmod 0711 'webmin/procmail' maybe chgrp 'bin' 'webmin/procmail/config' diff --git a/default/amavisd-milter b/default/amavisd-milter index e4ab10b11..c43ef45e8 100644 --- a/default/amavisd-milter +++ b/default/amavisd-milter @@ -10,7 +10,7 @@ #PIDFILE=/var/run/amavis/amavisd-milter.pid # This is the default location of the milter socket -#MILTERSOCKET=/var/lib/amavis/amavisd-milter.sock +MILTERSOCKET=/var/lib/amavis/amavisd-milter.sock # If you want the milter daemon to listen on tcp please # use something like the next line: #MILTERSOCKET=inet:60001@127.0.0.1 @@ -21,7 +21,7 @@ #MILTERSOCKET=/var/spool/postfix/amavis/amavis.sock # The default location of the amavisd-new socket -#AMAVISSOCKET=/var/lib/amavis/amavisd.sock +AMAVISSOCKET=/var/run/amavis/amavisd.sock # Here amavisd-milter stores the mails which should get # checked (needs to be changed when amavisd-new TEMPBASE @@ -36,4 +36,4 @@ # Set these two options if you want the socket to have # special permissions (usefull mainly for postfix). #MILTERSOCKETOWNER="postfix:postfix" -#MILTERSOCKETMODE="0660" +MILTERSOCKETMODE="0660" diff --git a/dovecot/dovecot-sql.conf b/dovecot/dovecot-sql.conf index 223611989..e5e5551f6 100755 --- a/dovecot/dovecot-sql.conf +++ b/dovecot/dovecot-sql.conf @@ -8,3 +8,23 @@ user_query = SELECT concat('*:storage=', quota, 'M') AS quota_rule FROM accounts iterate_query = SELECT username, domain FROM accounts where sendonly = false; +map { + pattern = shared/shared-boxes/user/$to/$from + table = user_shares + value_field = dummy + + fields { + from_user = $from + to_user = $to + } +} + +map { + pattern = shared/shared-boxes/anyone/$from + table = anyone_shares + value_field = dummy + + fields { + from_user = $from + } +} diff --git a/dovecot/dovecot.conf b/dovecot/dovecot.conf index a6ec19d44..32108857f 100644 --- a/dovecot/dovecot.conf +++ b/dovecot/dovecot.conf @@ -165,4 +165,5 @@ plugin { antispam_pipe_program = /var/vmail/spampipe.sh antispam_pipe_program_spam_arg = --spam antispam_pipe_program_notspam_arg = --ham + } diff --git a/group b/group index cb8d05977..6314b70d9 100644 --- a/group +++ b/group @@ -60,4 +60,4 @@ opendkim:x:119:postfix amavis:x:120:postfix debian-spamd:x:121: bind:x:122: -opendmarc:x:123: +opendmarc:x:123:postfix diff --git a/group- b/group- index 4092d277e..cb8d05977 100644 --- a/group- +++ b/group- @@ -60,3 +60,4 @@ opendkim:x:119:postfix amavis:x:120:postfix debian-spamd:x:121: bind:x:122: +opendmarc:x:123: diff --git a/gshadow b/gshadow index 63a3b7ed1..f6ecd0c90 100644 --- a/gshadow +++ b/gshadow @@ -60,4 +60,4 @@ opendkim:!::postfix amavis:!::postfix debian-spamd:!:: bind:!:: -opendmarc:!:: +opendmarc:!::postfix diff --git a/gshadow- b/gshadow- index 948f7c5f6..63a3b7ed1 100644 --- a/gshadow- +++ b/gshadow- @@ -60,3 +60,4 @@ opendkim:!::postfix amavis:!::postfix debian-spamd:!:: bind:!:: +opendmarc:!:: diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem index 7f44f9a18..3c1cb1f04 100644 --- a/myssl/dh2048.pem +++ b/myssl/dh2048.pem @@ -1,8 +1,8 @@ -----BEGIN DH PARAMETERS----- -MIIBCAKCAQEAl0079yq/qeHRwGQOxqMx9nLAJRSTfenYOPs/1zJT5QjW6FKzuCZ+ -/i9toFlyhANhRw+rSewrLxRniLswc/a97EnXvWyYXocQMxirTriVjy+xJByM8/Gq -MTCdYhlzsAclhkZy1O7RMUtm1SI4Jf92y6PIPMKer8akS4wwHfuxqhZXyUmK8EEn -pnRKD2GyDE/WeawhybvYiyVxGTtX/n3BjymUpRMVyhK4NbELx9rv7AL6Ip2pmP8K -Z4zYKmDrjFkCJNzCrfV4WKpitini+o+VfxhHVUn+tjVtz9732LpyEJYMqyJlDBf9 -1GnOlvoffErDdVF1nQ8CRvAq10G/j/ZS2wIBAg== +MIIBCAKCAQEAqBtT7GCGBM0IheDyqLxHglqoP03Rxx7qrA2kr8pAZli5Obqx03Br +HvkFkxjeqoFn9DPFJXGjw+mjDLd8L3XU5F/hnlRefFd62mGHdUXs4Hb8hkQJuAIO +zrxZ49XU6i6ggqr8RfUUyIb27KRF0Md0wVRKu/AbS7cmpecVP3jnpayVD0ARdPXv +/8mUp9wYLRfuQGBIEkodnFKivIov+V6AnjNYeu1r6GGvfxBOCzon+MvqO8F2WWTe +I/SX43uwzIymnQEyAKCMeiIKyg9HXotc6RCh4tcKhiznyJll0hvJ/XMeFzQosQt6 +SAgMHd2mA6PyMiAMRCFRkOKtWT+76t9vmwIBAg== -----END DH PARAMETERS----- diff --git a/opendmarc.conf b/opendmarc.conf index 421858c2e..84fb725d5 100644 --- a/opendmarc.conf +++ b/opendmarc.conf @@ -10,7 +10,7 @@ ## provided, the name of the host running the filter (as returned by the ## gethostname(3) function) will be used. # -# AuthservID name +AuthservID mail ## FailureReports { true | false } ## default "false" @@ -90,7 +90,7 @@ Syslog true ## with a comma. The key word "HOSTNAME" will be replaced by the name of ## the host running the filter as reported by the gethostname(3) function. # -# TrustedAuthservIDs HOSTNAME +TrustedAuthservIDs hoellein.online,siedlerverein-wittgensdorf.de ## UMask mask ## default (none) @@ -111,4 +111,11 @@ UMask 0002 ## The process will be assigned all of the groups and primary group ID of ## the named userid unless an alternate group is specified. # -UserID opendmarc +UserID opendmarc:opendmarc + +IgnoreHosts /etc/opendmarc/ignore.hosts +HistoryFile /var/run/opendmarc/opendmarc.dat +#for testing: +SoftwareHeader true +#IgnoreAuthenticatedClients true +MilterDebug 5 diff --git a/opendmarc/ignore.hosts b/opendmarc/ignore.hosts new file mode 100644 index 000000000..2fbb50c4a --- /dev/null +++ b/opendmarc/ignore.hosts @@ -0,0 +1 @@ +localhost diff --git a/postfix/main.cf b/postfix/main.cf index 66cd93433..a68a80dd4 100644 --- a/postfix/main.cf +++ b/postfix/main.cf @@ -69,6 +69,7 @@ milter_default_action = accept milter_protocol = 2 smtpd_milters = unix:/var/lib/amavis/amavisd-milter.sock, unix:/var/run/opendkim/opendkim.sock + unix:/var/run/opendmarc/opendmarc.sock non_smtpd_milters = unix:/var/run/opendkim/opendkim.sock ## diff --git a/webmin/authentic-theme/settings-root b/webmin/authentic-theme/settings-root new file mode 100644 index 000000000..4e0ee652c --- /dev/null +++ b/webmin/authentic-theme/settings-root @@ -0,0 +1,44 @@ +config_portable_module_filemanager_notification_type='4'; +config_portable_theme_locale_languages='en'; +settings_contrast_level_navigation=1; +settings_invert_level_navigation=0; +config_portable_theme_locale_format_short='L'; +config_portable_module_filemanager_tree_exclude_on_first_load=true; +config_portable_module_filemanager_force_tar=true; +config_portable_module_filemanager_remember_tabs=true; +config_portable_module_filemanager_switch_user=true; +config_portable_module_filemanager_hide_toolbar=false; +settings_contrast_mode=false; +settings_background_color='gainsboro'; +settings_font_family=0; +settings_cm_editor_palette='monokai'; +settings_force_night_mode=0; +config_portable_module_filemanager_tree_expand_search=true; +config_portable_theme_locale_format_long='LL'; +config_portable_module_filemanager_hide_actions=true; +settings_right_page_hide_persistent_vscroll=true; +config_portable_module_filemanager_hovered_toolbar=false; +config_portable_module_filemanager_default_sort=0; +settings_enable_container_offset=true; +settings_show_night_mode_link=true; +settings_animation_left=true; +config_portable_module_xsql_fit_content_screen_height=false; +settings_grayscale_level_navigation=0; +settings_navigation_color='blue'; +config_portable_module_filemanager_hide_tree_view=false; +config_portable_theme_locale_language=0; +settings_leftmenu_button_refresh=false; +settings_hide_top_loader=false; +settings_button_tooltip=true; +settings_sysinfo_link_mini=false; +settings_animation_tabs=false; +config_portable_theme_locale_format_full='LLLL'; +settings_brightness_level_navigation=1; +settings_hotkeys_active=true; +config_portable_module_filemanager_tree_view_depth='2'; +config_portable_module_filemanager_records_per_page='20'; +settings_theme_options_button=true; +settings_hue_level_navigation=0; +settings_sepia_level_navigation=0; +config_portable_module_filemanager_calculate_size=false; +settings_saturate_level_navigation=1; diff --git a/webmin/bandwidth/config b/webmin/bandwidth/config index ee8595f7a..da72c415d 100644 --- a/webmin/bandwidth/config +++ b/webmin/bandwidth/config @@ -1,2 +1,2 @@ bandwidth_log=/var/log/bandwidth -firewall_system= +firewall_system=firewall diff --git a/webmin/bind8/zone-names b/webmin/bind8/zone-names index 9af9d0ced..5ce5bc998 100644 --- a/webmin/bind8/zone-names +++ b/webmin/bind8/zone-names @@ -1,5 +1,11 @@ pidfile_config=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid no_chroot_config=0 -base=/etc/bind +base=/var/cache/bind version=3 -pidfile=/var/run/named.pid +pidfile=/var/run/named/named.pid +zone_4=255.in-addr.arpa 6 master * /etc/bind/db.255 +zone_3=0.in-addr.arpa 5 master * /etc/bind/db.0 +zone_2=127.in-addr.arpa 4 master * /etc/bind/db.127 +zone_0=. 2 hint * /etc/bind/db.root +zone_1=localhost 3 master * /etc/bind/db.local +file_/etc/bind/named.conf.default-zones=1521820389 diff --git a/webmin/config b/webmin/config index 8e9b6f3ba..603438f04 100644 --- a/webmin/config +++ b/webmin/config @@ -18,3 +18,15 @@ referers_none=1 md5pass=1 theme=authentic-theme product=webmin +lang_root=de.UTF-8 +webprefix= +feedback_to= +showhost=0 +hostnamedisplay= +hostnamemode=0 +nofeedbackcc=0 +sysinfo=0 +help_width= +dateformat=dd/mon/yyyy +showlogin=0 +help_height= diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf index ccbc13ba0..3820610cb 100644 --- a/webmin/miniserv.conf +++ b/webmin/miniserv.conf @@ -44,3 +44,4 @@ login_script=/etc/webmin/login.pl failed_script=/etc/webmin/failed.pl sudo=1 nolog=.*xhr.* +logouttimes= diff --git a/webmin/miniserv.users b/webmin/miniserv.users index f7338497a..414b855e7 100644 --- a/webmin/miniserv.users +++ b/webmin/miniserv.users @@ -1 +1 @@ -root:x:0 +root:x::::::::0:0::: diff --git a/webmin/proc/index b/webmin/proc/index new file mode 100644 index 000000000..34bb90585 --- /dev/null +++ b/webmin/proc/index @@ -0,0 +1 @@ +index_size.cgi? diff --git a/webmin/webmin/config b/webmin/webmin/config index c4a8de31e..b7eb88767 100644 --- a/webmin/webmin/config +++ b/webmin/webmin/config @@ -8,4 +8,4 @@ update=0 upmins=47 uphour=23 last_version_number=1.890 -last_version_check=1540719440 +last_version_check=1541938672 -- 2.43.0