| 1 |
jpp |
1.1 |
diff -Nur --no-dereference smeserver-dovecot-1.6.0.old/createlinks smeserver-dovecot-1.6.0/createlinks |
| 2 |
|
|
--- smeserver-dovecot-1.6.0.old/createlinks 2021-05-30 23:21:05.408000000 -0400 |
| 3 |
|
|
+++ smeserver-dovecot-1.6.0/createlinks 2021-05-30 23:32:52.632000000 -0400 |
| 4 |
|
|
@@ -4,6 +4,7 @@ |
| 5 |
|
|
|
| 6 |
|
|
|
| 7 |
|
|
templates2events("/etc/dovecot/dovecot.conf", qw(email-update bootstrap-console-save ssl-update smeserver-dovecot-update ip-change)); |
| 8 |
|
|
+templates2events("/etc/dovecot/ssl/imapd.pem", qw(email-update bootstrap-console-save ssl-update smeserver-dovecot-update ip-change)); |
| 9 |
|
|
templates2events("/etc/dovecot/master.users", qw(email-update bootstrap-console-save smeserver-dovecot-update)); |
| 10 |
|
|
templates2events("/etc/pam.d/dovecotadmin", qw(email-update bootstrap-console-save smeserver-dovecot-update)); |
| 11 |
|
|
|
| 12 |
|
|
@@ -21,7 +22,6 @@ |
| 13 |
|
|
templates2events("/etc/rsyslog.conf","smeserver-dovecot-update"); |
| 14 |
|
|
templates2events("/usr/lib/systemd/system/dovecot.service.d/50koozali.conf", qw(bootstrap-console-save console-save post-install post-upgrade smeserver-dovecot-update )); |
| 15 |
|
|
|
| 16 |
|
|
- |
| 17 |
|
|
# in case the ip change |
| 18 |
|
|
safe_symlink("sigusr2", "root/etc/e-smith/events/ip-change/services2adjust/dovecot"); |
| 19 |
|
|
|
| 20 |
|
|
diff -Nur --no-dereference smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/dovecot.service.d/50koozali.conf/40service smeserver-dovecot-1.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/dovecot.service.d/50koozali.conf/40service |
| 21 |
|
|
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/dovecot.service.d/50koozali.conf/40service 2021-05-30 23:21:05.409000000 -0400 |
| 22 |
|
|
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/dovecot.service.d/50koozali.conf/40service 2021-05-30 23:37:02.118000000 -0400 |
| 23 |
|
|
@@ -5,6 +5,6 @@ |
| 24 |
|
|
ExecStartPre=-/sbin/e-smith/service-status dovecot |
| 25 |
|
|
ExecStartPre=-/sbin/e-smith/expand-template /etc/dovecot/dovecot.conf |
| 26 |
|
|
ExecStartPre=-/sbin/e-smith/expand-template /etc/dovecot/master.users |
| 27 |
|
|
-ExecStartPre=-/sbin/e-smith/systemd/dovecot-control |
| 28 |
|
|
+ExecStartPre=-/sbin/e-smith/expand-template /etc/dovecot/ssl/imapd.pem |
| 29 |
|
|
ExecStartPre=-/usr/sbin/portrelease dovecot |
| 30 |
|
|
Restart=always |
| 31 |
|
|
diff -Nur --no-dereference smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates.metadata/etc/dovecot/ssl/imapd.pem smeserver-dovecot-1.6.0/root/etc/e-smith/templates.metadata/etc/dovecot/ssl/imapd.pem |
| 32 |
|
|
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates.metadata/etc/dovecot/ssl/imapd.pem 1969-12-31 19:00:00.000000000 -0500 |
| 33 |
|
|
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/templates.metadata/etc/dovecot/ssl/imapd.pem 2021-05-30 23:25:02.061000000 -0400 |
| 34 |
|
|
@@ -0,0 +1,4 @@ |
| 35 |
|
|
+TEMPLATE_PATH="/home/e-smith/ssl.pem" |
| 36 |
|
|
+OUTPUT_FILENAME="/etc/dovecot/ssl/imapd.pem" |
| 37 |
|
|
+GID="stunnel" |
| 38 |
|
|
+PERMS=0640 |
| 39 |
|
|
diff -Nur --no-dereference smeserver-dovecot-1.6.0.old/root/sbin/e-smith/systemd/dovecot-control smeserver-dovecot-1.6.0/root/sbin/e-smith/systemd/dovecot-control |
| 40 |
|
|
--- smeserver-dovecot-1.6.0.old/root/sbin/e-smith/systemd/dovecot-control 2021-05-30 23:21:05.410000000 -0400 |
| 41 |
|
|
+++ smeserver-dovecot-1.6.0/root/sbin/e-smith/systemd/dovecot-control 1969-12-31 19:00:00.000000000 -0500 |
| 42 |
|
|
@@ -1,41 +0,0 @@ |
| 43 |
|
|
-#!/usr/bin/perl -w |
| 44 |
|
|
- |
| 45 |
|
|
-#---------------------------------------------------------------------- |
| 46 |
|
|
-# copyright (C) 2011 Firewall-Services |
| 47 |
|
|
-# daniel@firewall-services.com |
| 48 |
|
|
-# |
| 49 |
|
|
-# This program is free software; you can redistribute it and/or modify |
| 50 |
|
|
-# it under the terms of the GNU General Public License as published by |
| 51 |
|
|
-# the Free Software Foundation; either version 2 of the License, or |
| 52 |
|
|
-# (at your option) any later version. |
| 53 |
|
|
-# |
| 54 |
|
|
-# This program is distributed in the hope that it will be useful, |
| 55 |
|
|
-# but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 56 |
|
|
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 57 |
|
|
-# GNU General Public License for more details. |
| 58 |
|
|
-# |
| 59 |
|
|
-# You should have received a copy of the GNU General Public License |
| 60 |
|
|
-# along with this program; if not, write to the Free Software |
| 61 |
|
|
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 62 |
|
|
-# |
| 63 |
|
|
-#---------------------------------------------------------------------- |
| 64 |
|
|
- |
| 65 |
|
|
- |
| 66 |
|
|
-use esmith::util; |
| 67 |
|
|
-use esmith::ConfigDB; |
| 68 |
|
|
-use File::Copy; |
| 69 |
|
|
- |
| 70 |
|
|
-my $c = esmith::ConfigDB->open_ro; |
| 71 |
|
|
-my $s = $c->get('SystemName')->value; |
| 72 |
|
|
-my $d = $c->get('DomainName')->value; |
| 73 |
|
|
- |
| 74 |
|
|
-my $pem = "/etc/dovecot/ssl/imapd.pem"; |
| 75 |
|
|
-# Now copy system pem file into jail used by ldap |
| 76 |
|
|
-copy("/home/e-smith/ssl.pem/$s.$d.pem", "$pem.$$") |
| 77 |
|
|
- or die "failed to copy SSL PEM: $!"; |
| 78 |
|
|
-chmod 0440, "$pem.$$"; |
| 79 |
|
|
-esmith::util::chownFile("root", "stunnel", "$pem.$$"); |
| 80 |
|
|
-rename("$pem.$$", "$pem") |
| 81 |
|
|
- or die "failed to rename $pem.$$ to $pem: $!"; |
| 82 |
|
|
- |
| 83 |
|
|
- |
Parent Directory
| 
Revision Log
| 
Revision Graph
