Merge branch 'master' of merak.carnet.hr:/srv/paketi/carnet-debian/scm/postfix-cn

diff --combined debian/changelog
index 6fb05ea,7a80985..20e7866
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,22 @@@
++<<<<<<< HEAD
 +postfix-cn (3.4.10~cn0) stable; urgency=medium
 +
 +  * Prva verzija za buster
 +
 + -- Ivan Rako <Ivan.Rako@CARNET.hr>  Thu, 13 Aug 2020 19:05:45 +0200
 +
 +postfix-cn (3.1.8~cn1) stable; urgency=medium
++=======
+ postfix-cn (3.1.8~cn2) stable; urgency=medium
+ 
+   * Non-maintainer upload. 
+   * Dodaje izlazne poslužitelje za webmail u mynetworks (193.198.233.{95,96})
+   * Popravak greške kada duplicira unos "[::1]/128"
+ 
+  -- Zeljko Boros <Zeljko.Boros@CARNet.hr>  Wed, 05 Feb 2020 15:27:43 +0100
+ 
+ ppostfix-cn (3.1.8~cn1) stable; urgency=medium
++>>>>>>> 1185b2ef230939782be3a96949ad7d7dfa738686
  
    * sdbm->btree
    * rjesava gresku "using backwards-compatible default setting chroot=y"

diff --combined debian/postinst
index 040623f,cde2e48..c61af86
--- 1/debian/postinst
--- 2/debian/postinst
+++ b/debian/postinst
@@@ -5,7 -5,7 +5,7 @@@ set -
  [ "$1" = "configure" ] || exit 0
  [ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
  
 -# Load CARNet Tools
 +# Load CARNET Tools
  . /usr/share/carnet-tools/functions.sh
  
  # Load Debconf
@@@ -94,14 -94,6 +94,14 @@@ if [ -f /etc/postfix/master.cf ]; the
                     "s/#   $option/$option/g" \
                     /etc/postfix/master.cf || true
    done
 +
 +  for option in  "o smtpd_client_restrictions=" \
 +                 "o smtpd_helo_restrictions=" \
 +                 "o smtpd_sender_restrictions="; do
 +  cp_check_and_sed "$option" \
 +                   "s/.*$option/# -$option/g" \
 +                   /etc/postfix/master.cf || true
 +  done
  fi
  
  # ovo manje/vise uzima kao default, ali u slucaju da je multihomed stroj,
@@@ -115,10 -107,11 +115,11 @@@ postconf -e append_dot_mydomain="yes
  postconf -e append_at_myorigin="yes"
  
  # dodaj 127.0.0.0/8, netaddr i ipv6-localhost
+ # dodaje izlazne servere za webmail --zelja
  mynetworks="`postconf -h mynetworks`"
- for i in "127.0.0.0/8" "$netaddr" "[::1]/128"; do
+ for i in "127.0.0.0/8" "\[::1\]/128" "$netaddr" "193.198.233.95" "193.198.233.96"; do
    if ! echo $mynetworks | grep -q $i; then
-    mynetworks="$mynetworks $i"
+    mynetworks="$mynetworks, $i"
    fi
  done
  postconf -e mynetworks="$mynetworks"