From 5e1e08eec7bc76f10224669916189205b4a96ef2 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 7 Feb 2017 03:10:06 +0100 Subject: [PATCH] daily autocommit --- config-archive/etc/postfix/main.cf | 4 +- config-archive/etc/postfix/main.cf.1 | 4 +- config-archive/etc/postfix/main.cf.2 | 11 +-- config-archive/etc/postfix/main.cf.3 | 5 +- config-archive/etc/postfix/main.cf.4 | 4 +- config-archive/etc/postfix/main.cf.5 | 5 +- config-archive/etc/postfix/main.cf.6 | 25 ++++- config-archive/etc/postfix/main.cf.7 | 6 +- config-archive/etc/postfix/main.cf.8 | 4 +- config-archive/etc/postfix/main.cf.9 | 4 +- config-archive/etc/postfix/main.cf.dist | 4 +- config-archive/etc/sddm.conf | 108 +++++++++++++++++++++ config-archive/etc/sddm.conf.dist | 120 ++++++++++++++++++++++++ cups/subscriptions.conf | 4 +- postfix/main.cf | 4 +- sddm.conf | 71 ++++++++------ 16 files changed, 324 insertions(+), 59 deletions(-) create mode 100644 config-archive/etc/sddm.conf create mode 100644 config-archive/etc/sddm.conf.dist diff --git a/config-archive/etc/postfix/main.cf b/config-archive/etc/postfix/main.cf index 1cc3c1a5..54ce017a 100644 --- a/config-archive/etc/postfix/main.cf +++ b/config-archive/etc/postfix/main.cf @@ -664,7 +664,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-3.1.0-r1/html +html_directory = /usr/share/doc/postfix-3.1.2-r1/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -677,7 +677,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-3.1.0-r1/readme +readme_directory = /usr/share/doc/postfix-3.1.2-r1/readme # inet_protocols = ipv4 meta_directory = /etc/postfix shlib_directory = /usr/lib64/postfix/${mail_version} diff --git a/config-archive/etc/postfix/main.cf.1 b/config-archive/etc/postfix/main.cf.1 index 7329883d..1cc3c1a5 100644 --- a/config-archive/etc/postfix/main.cf.1 +++ b/config-archive/etc/postfix/main.cf.1 @@ -664,7 +664,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-3.1.0/html +html_directory = /usr/share/doc/postfix-3.1.0-r1/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -677,7 +677,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-3.1.0/readme +readme_directory = /usr/share/doc/postfix-3.1.0-r1/readme # inet_protocols = ipv4 meta_directory = /etc/postfix shlib_directory = /usr/lib64/postfix/${mail_version} diff --git a/config-archive/etc/postfix/main.cf.2 b/config-archive/etc/postfix/main.cf.2 index 2b6cf73c..7329883d 100644 --- a/config-archive/etc/postfix/main.cf.2 +++ b/config-archive/etc/postfix/main.cf.2 @@ -157,8 +157,8 @@ inet_interfaces = 10.12.11.2, localhost # compatible delivery agent that lookups all recipients in /etc/passwd # and /etc/aliases or their equivalent. # -# The default is $myhostname + localhost.$mydomain. On a mail domain -# gateway, you should also include $mydomain. +# The default is $myhostname + localhost.$mydomain + localhost. On +# a mail domain gateway, you should also include $mydomain. # # Do not specify the names of virtual domains - those domains are # specified elsewhere (see VIRTUAL_README). @@ -664,7 +664,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-3.0.3-r1/html +html_directory = /usr/share/doc/postfix-3.1.0/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -677,8 +677,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-3.0.3-r1/readme - +readme_directory = /usr/share/doc/postfix-3.1.0/readme # inet_protocols = ipv4 meta_directory = /etc/postfix shlib_directory = /usr/lib64/postfix/${mail_version} @@ -694,7 +693,7 @@ smtpd_sasl_local_domain = $myhostname smtp_sasl_auth_enable = yes smtp_sasl_password_maps = hash:/etc/postfix/smtp_auth smtp_sasl_security_options = noanonymous -relayhost = [mail.brehm-online.com] +relayhost = [mail.uhu-banane.net]:submission #relayhost = [helga-six.brehm-online.com] smtpd_use_tls = yes diff --git a/config-archive/etc/postfix/main.cf.3 b/config-archive/etc/postfix/main.cf.3 index 6b000688..2b6cf73c 100644 --- a/config-archive/etc/postfix/main.cf.3 +++ b/config-archive/etc/postfix/main.cf.3 @@ -664,7 +664,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-3.0.2/html +html_directory = /usr/share/doc/postfix-3.0.3-r1/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -677,7 +677,8 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-3.0.2/readme +readme_directory = /usr/share/doc/postfix-3.0.3-r1/readme + # inet_protocols = ipv4 meta_directory = /etc/postfix shlib_directory = /usr/lib64/postfix/${mail_version} diff --git a/config-archive/etc/postfix/main.cf.4 b/config-archive/etc/postfix/main.cf.4 index 38714de1..6b000688 100644 --- a/config-archive/etc/postfix/main.cf.4 +++ b/config-archive/etc/postfix/main.cf.4 @@ -664,7 +664,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-3.0.1-r1/html +html_directory = /usr/share/doc/postfix-3.0.2/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -677,7 +677,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-3.0.1-r1/readme +readme_directory = /usr/share/doc/postfix-3.0.2/readme # inet_protocols = ipv4 meta_directory = /etc/postfix shlib_directory = /usr/lib64/postfix/${mail_version} diff --git a/config-archive/etc/postfix/main.cf.5 b/config-archive/etc/postfix/main.cf.5 index 2da72a08..38714de1 100644 --- a/config-archive/etc/postfix/main.cf.5 +++ b/config-archive/etc/postfix/main.cf.5 @@ -664,7 +664,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-3.0.0/html +html_directory = /usr/share/doc/postfix-3.0.1-r1/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -677,7 +677,8 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-3.0.0/readme +readme_directory = /usr/share/doc/postfix-3.0.1-r1/readme +# inet_protocols = ipv4 meta_directory = /etc/postfix shlib_directory = /usr/lib64/postfix/${mail_version} home_mailbox = .maildir/ diff --git a/config-archive/etc/postfix/main.cf.6 b/config-archive/etc/postfix/main.cf.6 index 6ffa90b0..2da72a08 100644 --- a/config-archive/etc/postfix/main.cf.6 +++ b/config-archive/etc/postfix/main.cf.6 @@ -10,6 +10,25 @@ # For best results, change no more than 2-3 parameters at a time, # and test if Postfix still works after every change. +# COMPATIBILITY +# +# The compatibility_level determines what default settings Postfix +# will use for main.cf and master.cf settings. These defaults will +# change over time. +# +# To avoid breaking things, Postfix will use backwards-compatible +# default settings and log where it uses those old backwards-compatible +# default settings, until the system administrator has determined +# if any backwards-compatible default settings need to be made +# permanent in main.cf or master.cf. +# +# When this review is complete, update the compatibility_level setting +# below as recommended in the RELEASE_NOTES file. +# +# The level below is what should be used with new (not upgrade) installs. +# +#compatibility_level = 2 + # SOFT BOUNCE # # The soft_bounce parameter provides a limited safety net for @@ -645,7 +664,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.11.3/html +html_directory = /usr/share/doc/postfix-3.0.0/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -658,7 +677,9 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.11.3/readme +readme_directory = /usr/share/doc/postfix-3.0.0/readme +meta_directory = /etc/postfix +shlib_directory = /usr/lib64/postfix/${mail_version} home_mailbox = .maildir/ smtpd_sasl_auth_enable = yes diff --git a/config-archive/etc/postfix/main.cf.7 b/config-archive/etc/postfix/main.cf.7 index 5e3d60fd..6ffa90b0 100644 --- a/config-archive/etc/postfix/main.cf.7 +++ b/config-archive/etc/postfix/main.cf.7 @@ -5,7 +5,7 @@ # For common configuration examples, see BASIC_CONFIGURATION_README # and STANDARD_CONFIGURATION_README. To find these documents, use # the command "postconf html_directory readme_directory", or go to -# http://www.postfix.org/. +# http://www.postfix.org/BASIC_CONFIGURATION_README.html etc. # # For best results, change no more than 2-3 parameters at a time, # and test if Postfix still works after every change. @@ -645,7 +645,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.10.3/html +html_directory = /usr/share/doc/postfix-2.11.3/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -658,7 +658,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.10.3/readme +readme_directory = /usr/share/doc/postfix-2.11.3/readme home_mailbox = .maildir/ smtpd_sasl_auth_enable = yes diff --git a/config-archive/etc/postfix/main.cf.8 b/config-archive/etc/postfix/main.cf.8 index 0436c1c4..5e3d60fd 100644 --- a/config-archive/etc/postfix/main.cf.8 +++ b/config-archive/etc/postfix/main.cf.8 @@ -645,7 +645,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.10.2/html +html_directory = /usr/share/doc/postfix-2.10.3/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -658,7 +658,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.10.2/readme +readme_directory = /usr/share/doc/postfix-2.10.3/readme home_mailbox = .maildir/ smtpd_sasl_auth_enable = yes diff --git a/config-archive/etc/postfix/main.cf.9 b/config-archive/etc/postfix/main.cf.9 index f7e2a6a6..0436c1c4 100644 --- a/config-archive/etc/postfix/main.cf.9 +++ b/config-archive/etc/postfix/main.cf.9 @@ -645,7 +645,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.10.1/html +html_directory = /usr/share/doc/postfix-2.10.2/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -658,7 +658,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.10.1/readme +readme_directory = /usr/share/doc/postfix-2.10.2/readme home_mailbox = .maildir/ smtpd_sasl_auth_enable = yes diff --git a/config-archive/etc/postfix/main.cf.dist b/config-archive/etc/postfix/main.cf.dist index 00a5e742..fe515de0 100644 --- a/config-archive/etc/postfix/main.cf.dist +++ b/config-archive/etc/postfix/main.cf.dist @@ -659,7 +659,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-3.1.2-r1/html +html_directory = /usr/share/doc/postfix-3.1.2-r2/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -672,7 +672,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-3.1.2-r1/readme +readme_directory = /usr/share/doc/postfix-3.1.2-r2/readme inet_protocols = ipv4 meta_directory = /etc/postfix shlib_directory = /usr/lib64/postfix/${mail_version} diff --git a/config-archive/etc/sddm.conf b/config-archive/etc/sddm.conf new file mode 100644 index 00000000..404f820a --- /dev/null +++ b/config-archive/etc/sddm.conf @@ -0,0 +1,108 @@ +[Autologin] +# Autologin again on session exit +Relogin=false + +# Autologin session +Session= + +# Autologin user +User= + + +[General] +# Halt command +#HaltCommand=/usr/bin/systemctl poweroff +HaltCommand=/sbin/poweroff + +# Initial NumLock state +# Valid values: on|off|none +# If property is set to none, numlock won't be changed +Numlock=none + +# Reboot command +#RebootCommand=/usr/bin/systemctl reboot +RebootCommand=/sbin/reboot + + +[Theme] +# Current theme name +#Current=maui +Current=deepin + +# Cursor theme +CursorTheme= + +# Face icon directory +# The files should be in username.face.icon format +FacesDir=/usr/share/sddm/faces + +# Theme directory path +ThemeDir=/usr/share/sddm/themes + + +[Users] +# Default $PATH +DefaultPath=/bin:/usr/bin:/usr/local/bin + +# Hidden shells +# Users with these shells as their default won't be listed +HideShells= + +# Hidden users +HideUsers= + +# Maximum user id for displayed users +MaximumUid=60000 + +# Minimum user id for displayed users +MinimumUid=1000 + +# Remember the session of the last successfully logged in user +RememberLastSession=true + +# Remember the last successfully logged in user +RememberLastUser=true + + +[WaylandDisplay] +# Wayland session script path +# A script to execute when starting the desktop session +SessionCommand=/usr/share/sddm/scripts/wayland-session + +# Session description directory +SessionDir=/usr/share/wayland-sessions + + +[XDisplay] +# Xsetup script path +# A script to execute when starting the display server +DisplayCommand=/usr/share/sddm/scripts/Xsetup + +# Xstop script path +# A script to execute when stopping the display server +DisplayStopCommand=/usr/share/sddm/scripts/Xstop + +# Minimum VT +# The lowest virtual terminal number that will be used. +MinimumVT=7 + +# X server arguments +ServerArguments=-nolisten tcp + +# X server path +ServerPath=/usr/bin/X + +# Xsession script path +# A script to execute when starting the desktop session +SessionCommand=/usr/share/sddm/scripts/Xsession + +# Session description directory +SessionDir=/usr/share/xsessions + +# Xauth path +XauthPath=/usr/bin/xauth + +# Xephyr path +XephyrPath=/usr/bin/Xephyr + +# vim: filetype=dosini diff --git a/config-archive/etc/sddm.conf.dist b/config-archive/etc/sddm.conf.dist new file mode 100644 index 00000000..626f6669 --- /dev/null +++ b/config-archive/etc/sddm.conf.dist @@ -0,0 +1,120 @@ +[Autologin] +# Whether sddm should automatically log back into sessions when they exit +Relogin=false + +# Name of session file for autologin session +Session= + +# Username for autologin session +User= + + +[General] +# Halt command +HaltCommand=/sbin/poweroff + +# Input method module +InputMethod= + +# Initial NumLock state. Can be on, off or none. +# If property is set to none, numlock won't be changed +# NOTE: Currently ignored if autologin is enabled. +Numlock=none + +# Reboot command +RebootCommand=/sbin/reboot + + +[Theme] +# Current theme name +Current=deepin + +# Cursor theme used in the greeter +CursorTheme= + +# Number of users to use as threshold +# above which avatars are disabled +# unless explicitly enabled with EnableAvatars +DisableAvatarsThreshold=7 + +# Enable display of custom user avatars +EnableAvatars=true + +# Global directory for user avatars +# The files should be named .face.icon +FacesDir=/usr/share/sddm/faces + +# Theme directory path +ThemeDir=/usr/share/sddm/themes + + +[Users] +# Default $PATH for logged in users +DefaultPath=/bin:/usr/bin:/usr/local/bin + +# Comma-separated list of shells. +# Users with these shells as their default won't be listed +HideShells= + +# Comma-separated list of users that should not be listed +HideUsers= + +# Maximum user id for displayed users +MaximumUid=60000 + +# Minimum user id for displayed users +MinimumUid=1000 + +# Remember the session of the last successfully logged in user +RememberLastSession=true + +# Remember the last successfully logged in user +RememberLastUser=true + + +[Wayland] +# Path to a script to execute when starting the desktop session +SessionCommand=/usr/share/sddm/scripts/wayland-session + +# Directory containing available Wayland sessions +SessionDir=/usr/share/wayland-sessions + +# Path to the user session log file +SessionLogFile=.local/share/sddm/wayland-session.log + + +[X11] +# Path to a script to execute when starting the display server +DisplayCommand=/usr/share/sddm/scripts/Xsetup + +# Path to a script to execute when stopping the display server +DisplayStopCommand=/usr/share/sddm/scripts/Xstop + +# The lowest virtual terminal number that will be used. +MinimumVT=1 + +# Arguments passed to the X server invocation +ServerArguments=-nolisten tcp + +# Path to X server binary +ServerPath=/usr/bin/X + +# Path to a script to execute when starting the desktop session +SessionCommand=/usr/share/sddm/scripts/Xsession + +# Directory containing available X sessions +SessionDir=/usr/share/xsessions + +# Path to the user session log file +SessionLogFile=.local/share/sddm/xorg-session.log + +# Path to the Xauthority file +UserAuthFile=.Xauthority + +# Path to xauth binary +XauthPath=/usr/bin/xauth + +# Path to Xephyr binary +XephyrPath=/usr/bin/Xephyr + + diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf index bad67b88..3bbe1d7c 100644 --- a/cups/subscriptions.conf +++ b/cups/subscriptions.conf @@ -1,5 +1,5 @@ # Subscription configuration file for CUPS v2.1.4 -# Written by cupsd on 2017-02-05 18:37 +# Written by cupsd on 2017-02-06 18:36 NextSubscriptionId 339 Events all @@ -7,6 +7,6 @@ Owner anonymous Recipient dbus:// LeaseDuration 86400 Interval 0 -ExpirationTime 1486402602 +ExpirationTime 1486488942 NextEventId 1 diff --git a/postfix/main.cf b/postfix/main.cf index 54ce017a..dc930f8c 100644 --- a/postfix/main.cf +++ b/postfix/main.cf @@ -664,7 +664,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-3.1.2-r1/html +html_directory = /usr/share/doc/postfix-3.1.2-r2/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -677,7 +677,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-3.1.2-r1/readme +readme_directory = /usr/share/doc/postfix-3.1.2-r2/readme # inet_protocols = ipv4 meta_directory = /etc/postfix shlib_directory = /usr/lib64/postfix/${mail_version} diff --git a/sddm.conf b/sddm.conf index 404f820a..f8abb634 100644 --- a/sddm.conf +++ b/sddm.conf @@ -1,11 +1,11 @@ [Autologin] -# Autologin again on session exit +# Whether sddm should automatically log back into sessions when they exit Relogin=false -# Autologin session +# Name of session file for autologin session Session= -# Autologin user +# Username for autologin session User= @@ -14,9 +14,12 @@ User= #HaltCommand=/usr/bin/systemctl poweroff HaltCommand=/sbin/poweroff -# Initial NumLock state -# Valid values: on|off|none +# Input method module +InputMethod= + +# Initial NumLock state. Can be on, off or none. # If property is set to none, numlock won't be changed +# NOTE: Currently ignored if autologin is enabled. Numlock=none # Reboot command @@ -29,11 +32,19 @@ RebootCommand=/sbin/reboot #Current=maui Current=deepin -# Cursor theme +# Cursor theme used in the greeter CursorTheme= -# Face icon directory -# The files should be in username.face.icon format +# Number of users to use as threshold +# above which avatars are disabled +# unless explicitly enabled with EnableAvatars +DisableAvatarsThreshold=7 + +# Enable display of custom user avatars +EnableAvatars=true + +# Global directory for user avatars +# The files should be named .face.icon FacesDir=/usr/share/sddm/faces # Theme directory path @@ -41,14 +52,14 @@ ThemeDir=/usr/share/sddm/themes [Users] -# Default $PATH +# Default $PATH for logged in users DefaultPath=/bin:/usr/bin:/usr/local/bin -# Hidden shells +# Comma-separated list of shells. # Users with these shells as their default won't be listed HideShells= -# Hidden users +# Comma-separated list of users that should not be listed HideUsers= # Maximum user id for displayed users @@ -64,45 +75,49 @@ RememberLastSession=true RememberLastUser=true -[WaylandDisplay] -# Wayland session script path -# A script to execute when starting the desktop session +[Wayland] +# Path to a script to execute when starting the desktop session SessionCommand=/usr/share/sddm/scripts/wayland-session -# Session description directory +# Directory containing available Wayland sessions SessionDir=/usr/share/wayland-sessions +# Path to the user session log file +SessionLogFile=.local/share/sddm/wayland-session.log -[XDisplay] -# Xsetup script path -# A script to execute when starting the display server + +[X11] +# Path to a script to execute when starting the display server DisplayCommand=/usr/share/sddm/scripts/Xsetup -# Xstop script path -# A script to execute when stopping the display server +# Path to a script to execute when stopping the display server DisplayStopCommand=/usr/share/sddm/scripts/Xstop -# Minimum VT # The lowest virtual terminal number that will be used. MinimumVT=7 -# X server arguments +# Arguments passed to the X server invocation ServerArguments=-nolisten tcp -# X server path +# Path to X server binary ServerPath=/usr/bin/X -# Xsession script path -# A script to execute when starting the desktop session +# Path to a script to execute when starting the desktop session SessionCommand=/usr/share/sddm/scripts/Xsession -# Session description directory +# Directory containing available X sessions SessionDir=/usr/share/xsessions -# Xauth path +# Path to the user session log file +SessionLogFile=.local/share/sddm/xorg-session.log + +# Path to the Xauthority file +UserAuthFile=.Xauthority + +# Path to xauth binary XauthPath=/usr/bin/xauth -# Xephyr path +# Path to Xephyr binary XephyrPath=/usr/bin/Xephyr # vim: filetype=dosini -- 2.39.5