diff options
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/base.scm | 16 | ||||
| -rw-r--r-- | gnu/services/dns.scm | 3 | ||||
| -rw-r--r-- | gnu/services/guix.scm | 2 | ||||
| -rw-r--r-- | gnu/services/messaging.scm | 11 |
4 files changed, 19 insertions, 13 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 3fb92e6da0..6865d03f25 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1397,23 +1397,24 @@ responsible for logging system messages."))) # level notice or higher and anything of level err or # higher to the console. # Don't log private authentication messages! - *.alert;auth.notice;authpriv.none /dev/console + *.alert;auth.notice;authpriv.none -/dev/console # Log anything (except mail) of level info or higher. # Don't log private authentication messages! - *.info;mail.none;authpriv.none /var/log/messages + *.info;mail.none;authpriv.none -/var/log/messages - # Like /var/log/messages, but also including \"debug\"-level logs. - *.debug;mail.none;authpriv.none /var/log/debug + # Log \"debug\"-level entries and nothing else. + *.=debug -/var/log/debug # Same, in a different place. - *.info;mail.none;authpriv.none /dev/tty12 + *.info;mail.none;authpriv.none -/dev/tty12 # The authpriv file has restricted access. + # 'fsync' the file after each line (hence the lack of a leading dash). authpriv.* /var/log/secure # Log all the mail messages in one place. - mail.* /var/log/maillog + mail.* -/var/log/maillog ")) (define* (syslog-service #:optional (config (syslog-configuration))) @@ -1438,7 +1439,8 @@ information on the configuration file syntax." (module "pam_limits.so") (arguments '("conf=/etc/security/limits.conf"))))) (if (member (pam-service-name pam) - '("login" "su" "slim" "gdm-password" "sddm")) + '("login" "su" "slim" "gdm-password" "sddm" + "sudo" "sshd")) (pam-service (inherit pam) (session (cons pam-limits diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index a220b33f15..50753b7ab6 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -978,8 +978,7 @@ manually.") (define (ddclient-activation config) "Return the activation GEXP for CONFIG." - (with-imported-modules '((guix build utils) - (ice-9 rdelim)) + (with-imported-modules '((guix build utils)) #~(begin (use-modules (guix build utils) (ice-9 rdelim)) diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index 413bf51ad8..ad7b020b69 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -643,7 +643,7 @@ ca-certificates.crt file in the system profile." #:group #$group #:pid-file "/var/run/guix-data-service/pid" ;; Allow time for migrations to run - #:pid-file-timeout 60 + #:pid-file-timeout 120 #:environment-variables `(,(string-append "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale") diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm index ec1acba416..48eff27b49 100644 --- a/gnu/services/messaging.scm +++ b/gnu/services/messaging.scm @@ -20,9 +20,10 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu services messaging) - #:use-module (gnu packages messaging) #:use-module (gnu packages admin) + #:use-module (gnu packages base) #:use-module (gnu packages irc) + #:use-module (gnu packages messaging) #:use-module (gnu packages tls) #:use-module (gnu services) #:use-module (gnu services shepherd) @@ -829,12 +830,15 @@ string, you could instantiate a prosody service like this: (file-append bitlbee "/sbin/bitlbee") #:name "bitlbee" #:preserved-environment-variables - '("PURPLE_PLUGIN_PATH") + '("PURPLE_PLUGIN_PATH" "GUIX_LOCPATH" "LC_ALL") #:mappings (list (file-system-mapping (source "/var/lib/bitlbee") (target source) (writable? #t)) (file-system-mapping + (source "/run/current-system/locale") + (target source)) + (file-system-mapping (source conf) (target conf))) #:namespaces (delq 'net %namespaces)))) @@ -867,7 +871,8 @@ string, you could instantiate a prosody service like this: ;; Allow 'bitlbee-purple' to use libpurple plugins. #:environment-variables (list (string-append "PURPLE_PLUGIN_PATH=" - #$plugins "/lib/purple-2"))) + #$plugins "/lib/purple-2") + "GUIX_LOCPATH=/run/current-system/locale")) (make-forkexec-constructor/container (list #$(file-append bitlbee "/sbin/bitlbee") |