diff --git a/bin/email.sh b/bin/email.sh index c06fd7d..f2d2aa9 100755 --- a/bin/email.sh +++ b/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 diff --git a/bin/user.sh b/bin/user.sh index 4a3f751..6fe2c25 100755 --- a/bin/user.sh +++ b/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 diff --git a/bin/zabbix.sh b/bin/zabbix.sh index 9eb31fc..09f42cb 100755 --- a/bin/zabbix.sh +++ b/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