diff options
author | Marius Mauch <genone@gentoo.org> | 2006-03-26 06:35:24 +0000 |
---|---|---|
committer | Marius Mauch <genone@gentoo.org> | 2006-03-26 06:35:24 +0000 |
commit | 2e8c935fb78beff2f4ebbb16876866be765194ac (patch) | |
tree | 2bdd68cdd59264632ad9d1fc62b82bcac5029144 /cnf | |
parent | eb81ae800e93a6103ab233d363afa417a8f0c2a4 (diff) | |
download | portage-2e8c935fb78beff2f4ebbb16876866be765194ac.tar.gz portage-2e8c935fb78beff2f4ebbb16876866be765194ac.tar.bz2 portage-2e8c935fb78beff2f4ebbb16876866be765194ac.zip |
move some elog defaults into make.globals, add new vars for mail from and subject (bug #116637), change default location for mod_save logfiles to PORT_LOGDIR/elog (bug #124165)
svn path=/main/trunk/; revision=3014
Diffstat (limited to 'cnf')
-rw-r--r-- | cnf/make.conf | 14 | ||||
-rw-r--r-- | cnf/make.globals | 7 |
2 files changed, 20 insertions, 1 deletions
diff --git a/cnf/make.conf b/cnf/make.conf index d993464ca..472d49bb3 100644 --- a/cnf/make.conf +++ b/cnf/make.conf @@ -305,7 +305,8 @@ PORTAGE_ELOG_CLASSES="warn error log" # PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules # included in portage are (empty means logging is disabled): -# save (saves one log per package in $PORTAGE_TMPDIR/elogs) +# save (saves one log per package in $PORT_LOGDIR/elog, +# /var/log/portage/elog if $PORT_LOGDIR is unset) # custom (passes all messages to $PORTAGE_LOG_COMMAND) # syslog (sends all messages to syslog) # mail (send all messages to the mailserver defined @@ -337,3 +338,14 @@ PORTAGE_ELOG_CLASSES="warn error log" #PORTAGE_ELOG_MAILURI="root@localhost localhost" (this is also the default setting) #PORTAGE_ELOG_MAILURI="user@some.domain mail.some.domain" (sends mails to user@some.domain using the mailserver mail.some.domain) #PORTAGE_ELOG_MAILURI="user@some.domain user:secret@mail.some.domain:100465" (this is left uncommented as a reader excercise ;) + +# PORTAGE_ELOG_MAILFROM: you can set the from-address of logmails with this variable, +# if unset mails are sent by "portage" (this default may fail +# in some environments). +#PORTAGE_ELOG_MAILFROM="portage@some.domain" + +# PORTAGE_ELOG_MAILSUBJECT: template string to be used as subject for logmails. The following +# variables are exanded: +# ${PACKAGE} - see description of PORTAGE_ELOG_COMMAND +# ${HOST} - FQDN of the host portage is running on +#PORTAGE_ELOG_MAILSUBJECT="package ${PACKAGE} merged on ${HOST} with notice" diff --git a/cnf/make.globals b/cnf/make.globals index 36f1d3042..dfc5d48a6 100644 --- a/cnf/make.globals +++ b/cnf/make.globals @@ -69,6 +69,13 @@ PORTAGE_INST_GID="0" # Mode bits for ${WORKDIR} (see ebuild.5). PORTAGE_WORKDIR_MODE="0700" +# Some defaults for elog +PORTAGE_ELOG_CLASSES="log warn error" + +PORTAGE_ELOG_MAILURI="root" +PORTAGE_ELOG_MAILSUBJECT="[portage] ebuild log for \${PACKAGE} on \${HOST}" +PORTAGE_ELOG_MAILFROM="portage" + # ***************************** # ** DO NOT EDIT THIS FILE ** # *************************************************** |