Skip to content

Commit

Permalink
EPN: ship the configuration file.
Browse files Browse the repository at this point in the history
Ship and install /etc/ipa/epn.conf.
Minor fixes to the associated man page.

Fixes: https://pagure.io/freeipa/issue/8374
Signed-off-by: François Cami <[email protected]>
Reviewed-By: Alexander Bokovoy <[email protected]>
Reviewed-By: Rob Crittenden <[email protected]>
  • Loading branch information
fcami committed Jun 25, 2020
1 parent 1f6ca41 commit 6efe991
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 5 deletions.
5 changes: 2 additions & 3 deletions client/man/epn.conf.5
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,10 @@ Specifies the From e-mail address value in the e-mails sent. The default is
root@localhost. Bounces will be sent here.
.TP
.B smtp_delay <milliseconds>
Time to wait, in milliseconds, between each e-mail sent to try to avoid overloading the mail queue.
Time to wait, in milliseconds, between each e-mail sent to try to avoid overloading the mail queue. The default is 0.
.TP
.B mail_from <address>
Specifies the From: e-mal address value in the e-mails sent. The default is
noreply@ipadefaultemaildomain. This value can be found by running
Specifies the From: e-mail address value in the e-mails sent. The default is noreply@ipadefaultemaildomain. This value can be found by running
.I ipa config-show
.TP
.B notify_ttls <list of days>
Expand Down
7 changes: 6 additions & 1 deletion client/share/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ dist_app_DATA = \
freeipa.template \
$(NULL)

epnconfdir = $(IPA_SYSCONF_DIR)/epn
epnconfdir = $(IPA_SYSCONF_DIR)
dist_epnconf_DATA = \
epn.conf \
$(NULL)

epntemplatedir = $(IPA_SYSCONF_DIR)/epn
dist_epntemplate_DATA = \
expire_msg.template \
$(NULL)
54 changes: 54 additions & 0 deletions client/share/epn.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# Global IPA-EPN [0] configuration file.
# For a complete explanation of each parameter, see the epn.conf(5)
# manual page.
# For best results, change no more than a single parameter at a time,
# and test if ipa-epn(1) still works as intended, using --dry-run when
# it makes sense.
#
# [0] https://github.com/freeipa/freeipa/blob/master/doc/designs/expiring-password-notification.md

[global]

# Specifies the SMTP server to use.
smtp_server = localhost

# Specifies the SMTP port.
smtp_port = 25

# Specifies the id of the user to authenticate with the SMTP server.
# Default None (empty value).
# smtp_user =

# Specifies the password for the authorized user.
# Default None (empty value).
# smtp_password =

# pecifies the number of seconds to wait for SMTP to respond.
smtp_timeout = 60

# Specifies the type of secure connection to make. Options are: none,
# starttls and ssl.
smtp_security = none

# Specifies the From e-mail address value in the e-mails sent. Bounces will
# be sent here.
smtp_admin = root@localhost

# Time to wait, in milliseconds, between each e-mail sent to try to avoid
# overloading the mail queue.
smtp_delay = 0

# Specifies the From: e-mail address value in the e-mails sent.
# The default when unset is noreply@ipadefaultemaildomain.
# This value can be found by running ipa config-show.
# mail_from =

# The list of days before a password expiration when ipa-epn should notify
# a user that their password will soon require a reset.
notify_ttls = 28, 14, 7, 3, 1

# Set the character set of the message.
msg_charset = utf8

# Set the message's MIME sub-content type.
msg_subtype = plain
4 changes: 3 additions & 1 deletion freeipa.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -1395,13 +1395,15 @@ fi

%files client-epn
%doc README.md Contributors.txt
%dir %{_sysconfdir}/ipa/epn
%license COPYING
%{_sbindir}/ipa-epn
%{_mandir}/man1/ipa-epn.1*
%{_mandir}/man5/epn.conf.5*
%attr(644,root,root) %{_unitdir}/ipa-epn.service
%attr(644,root,root) %{_unitdir}/ipa-epn.timer
%attr(644,root,root) %{_sysconfdir}/ipa/epn/expire_msg.template
%attr(600,root,root) %config(noreplace) %{_sysconfdir}/ipa/epn.conf
%attr(644,root,root) %config(noreplace) %{_sysconfdir}/ipa/epn/expire_msg.template

%files -n python3-ipaclient
%doc README.md Contributors.txt
Expand Down

0 comments on commit 6efe991

Please sign in to comment.