فهرست منبع

[SOGo] Fix ealarms, again, fixes #2136
[Compose] Update SOGo image

andryyy 6 سال پیش
والد
کامیت
4f278255a5
3فایلهای تغییر یافته به همراه2 افزوده شده و 5 حذف شده
  1. 1 1
      data/Dockerfiles/sogo/Dockerfile
  2. 0 3
      data/Dockerfiles/sogo/bootstrap-sogo.sh
  3. 1 1
      docker-compose.yml

+ 1 - 1
data/Dockerfiles/sogo/Dockerfile

@@ -36,7 +36,7 @@ RUN mkdir /usr/share/doc/sogo \
     sogo \
     sogo-activesync \
   && rm -rf /var/lib/apt/lists/* \
-  && echo '* * * * *   sogo   /usr/sbin/sogo-ealarms-notify 2>/dev/null' > /etc/cron.d/sogo \
+  && echo '* * * * *   sogo   /usr/sbin/sogo-ealarms-notify -p /etc/sogo/sieve.creds 2>/dev/null' > /etc/cron.d/sogo \
   && echo '* * * * *   sogo   /usr/sbin/sogo-tool expire-sessions 60' >> /etc/cron.d/sogo \
   && echo '0 0 * * *   sogo   /usr/sbin/sogo-tool update-autoreply -p /etc/sogo/sieve.creds' >> /etc/cron.d/sogo \
   && touch /etc/default/locale

+ 0 - 3
data/Dockerfiles/sogo/bootstrap-sogo.sh

@@ -167,9 +167,6 @@ echo '    </dict>
 chown sogo:sogo -R /var/lib/sogo/
 chmod 600 /var/lib/sogo/GNUstep/Defaults/sogod.plist
 
-# Add credentials to alarms
-sed -i 's/\/usr\/local\/sbin\/sogo-ealarms-notify/\/usr\/local\/sbin\/sogo-ealarms-notify -p \/etc\/sogo\/sieve.creds/g' /etc/cron.d/sogo
-
 # Patch ACLs (comment this out to enable any or authenticated targets for ACL)
 if patch -sfN --dry-run /usr/lib/GNUstep/SOGo/Templates/UIxAclEditor.wox < /acl.diff > /dev/null; then
   patch /usr/lib/GNUstep/SOGo/Templates/UIxAclEditor.wox < /acl.diff;

+ 1 - 1
docker-compose.yml

@@ -138,7 +138,7 @@ services:
             - phpfpm
 
     sogo-mailcow:
-      image: mailcow/sogo:1.48
+      image: mailcow/sogo:1.49
       build: ./data/Dockerfiles/sogo
       environment:
         - DBNAME=${DBNAME}