Browse Source

exim4 fix, zabbix update

Bachir Soussi Chiadmi 4 years ago
parent
commit
783afc1a3b
3 changed files with 10 additions and 12 deletions
  1. 6 5
      bin/email.sh
  2. 0 7
      bin/user.sh
  3. 4 0
      bin/zabbix.sh

+ 6 - 5
bin/email.sh

@@ -60,10 +60,11 @@ if [ "$installdkim" = "y" ]; then
   selector=$(date +%Y%m%d)
 
   mkdir /etc/exim4/dkim
-  openssl genrsa -out /etc/exim4/dkim/"$domain"-private.pem 1024 -outform PEM
-  openssl rsa -in /etc/exim4/dkim/"$domain"-private.pem -out /etc/exim4/dkim/"$domain".pem -pubout -outform PEM
-  chown root:Debian-exim /etc/exim4/dkim/"$domain"-private.pem
-  chmod 440 /etc/exim4/dkim/"$domain"-private.pem
+  # openssl genrsa -out /etc/exim4/dkim/"$domain"-private.pem 1024 -outform PEM
+  openssl genrsa -out /etc/exim4/dkim/"$domain"-private.key 1024
+  openssl rsa -in /etc/exim4/dkim/"$domain"-private.key -out /etc/exim4/dkim/"$domain".pub -pubout
+  chown root:Debian-exim /etc/exim4/dkim/"$domain"-private.key
+  chmod 440 /etc/exim4/dkim/"$domain"-private.key
 
   cp "$_assets"/exim4_dkim.conf /etc/exim4/conf.d/main/00_local_macros
   sed -i -r "s/DOMAIN_TO_CHANGE/$domain/g" /etc/exim4/conf.d/main/00_local_macros
@@ -73,7 +74,7 @@ if [ "$installdkim" = "y" ]; then
   systemctl restart exim4
   echo "please create a TXT entry in your dns zone : $selector._domainkey.$domain \n"
   echo "your public key is : \n"
-  cat /etc/exim4/dkim/"$domain".pem
+  cat /etc/exim4/dkim/"$domain".pub
   echo "press any key to continue."
   read continu
 else

+ 0 - 7
bin/user.sh

@@ -37,13 +37,6 @@ do
   fi
 done
 
-# TODO
-# ./install.sh: 42: bin/user.sh: adduser: not found
-# adding dev to admin group and limiting su to the admin group
-# ./install.sh: 44: bin/user.sh: groupadd: not found
-# ./install.sh: 45: bin/user.sh: usermod: not found
-# dpkg-statoverride: error: group 'admin' does not exist
-
 adduser "$user"
 echo "adding $user to admin group and limiting su to the admin group"
 groupadd admin

+ 4 - 0
bin/zabbix.sh

@@ -26,6 +26,10 @@ if [ ! -d "$_assets" ]; then
   fi
 fi
 
+# not necessary anymore zabbix-agent 4 is in apt
+# https://packages.debian.org/fr/buster/zabbix-agent
+# TODO downgrade zabbix-agent to 3.4
+
 wget -P /tmp/ http://repo.zabbix.com/zabbix/3.4/debian/pool/main/z/zabbix-release/zabbix-release_3.4-1+stretch_all.deb
 dpkg -i /tmp/zabbix-release_3.4-1+stretch_all.deb