Merge branch 'master' of git.nic.cz:turris/misc

cacerts/api.turris.pem

 -----BEGIN CERTIFICATE-----
-MIIGrTCCBZWgAwIBAgIDAa3UMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+MIIGrTCCBZWgAwIBAgIDAhWUMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
 TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
 YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MiBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMxMDE1MTYzMDUz
-WhcNMTUxMDE2MTM1OTMyWjCBuTEZMBcGA1UEDRMQNVc3MXNvVW5McjJKRG5nZTEL
+MiBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNDEwMTY1NDMw
+WhcNMTYwNDExMDIzOTQzWjCBuTEZMBcGA1UEDRMQN1Q3UDhkYzJoNTUxMjhGMDEL
 MAkGA1UEBhMCQ1oxGzAZBgNVBAgTEkhsYXZuaSBtZXN0byBQcmFoYTEaMBgGA1UE
 BxMRUHJhaGEgLSBWaW5vaHJhZHkxGTAXBgNVBAoTEENaLk5JQywgei5zLnAuby4x
 FjAUBgNVBAMTDWFwaS50dXJyaXMuY3oxIzAhBgkqhkiG9w0BCQEWFHBvc3RtYXN0
-ZXJAdHVycmlzLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuywl
-IM97E34EjuH0D3GTRSzFcF7XugCmCD3aor74Sx4LgqPgF6nfTf/k5T/+8xJRMPxe
-Z4ARu8IdviOKl3fFZHcU6APhb6PDP2BWx7VfsNUzFP3+X4w6DYqY4rizUSBFaxSz
-crFMDh5TVnDqKIC3f0mV7f2axlNbUarQqyuJD+2EQfejz3QDAmXmqqRJ9coRxkss
-o7MB8P8PLlVbzPw7Si0gXkosiIdcjglps2GhIlOTn+6OtUXEHd2bmMOfDLNF6wz4
-/X0W4VyGbCmKg1D7H8vb1g8vvOPnK+XeCA7TtuIzEc/xd0skc/j+trhCTYVXjWm4
-2llqrVVcmDbaBLMeBwIDAQABo4IC5zCCAuMwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-A6gwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRn2K76
-t2s+gscWVJlxAU8c5vtKPjAfBgNVHSMEGDAWgBQR2yNF/VTManFvhIoD1773AS8m
+ZXJAdHVycmlzLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAveid
+osXDV3T9G+K20ZWJOR9VucJNrv0Y81KjZyHZUvFfFn0njHScEw0yMPByTxLrUelZ
+wEGNxWyUTPPEN7TuDsz4Mk+fqJvz7uEG4ewmgMiA5xBMcR+GJds7i6stYVSqQy/u
+4Bj0Kx8Gq6uG4JSIqrhU7r5yfNQ7SZJt/N9W9wNCMGBXZjfpAlfhS1Xn1VVXbo2V
+laTr3q8n16lpfLCHpnmD95u4iWbB7xMDTNpIFnRSqmhrGGCN0LqwGrAOe+XQmqAm
+6xTU5VgdRn8vsMaNY0M875QZZ+uNJeKMleGRo/0uSKi6+beuXv5nNYql9pqm6xta
+URlGoY+rTU6ct9Yx0QIDAQABo4IC5zCCAuMwCQYDVR0TBAIwADALBgNVHQ8EBAMC
+A6gwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBTVHHVz
+JMBhiyLewHB2jDFW4WhYvDAfBgNVHSMEGDAWgBQR2yNF/VTManFvhIoD1773AS8m
 hjAjBgNVHREEHDAagg1hcGkudHVycmlzLmN6ggl0dXJyaXMuY3owggFWBgNVHSAE
 ggFNMIIBSTAIBgZngQwBAgIwggE7BgsrBgEEAYG1NwECAzCCASowLgYIKwYBBQUH
 AgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwgfcGCCsGAQUF
@@ -29,10 +29,10 @@ Y3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEFBQcwAYYtaHR0cDovL29j
 c3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczIvc2VydmVyL2NhMEIGCCsGAQUFBzAC
 hjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9zdWIuY2xhc3MyLnNlcnZl
 ci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5zdGFydHNzbC5jb20vMA0G
-CSqGSIb3DQEBBQUAA4IBAQAb5SmGRCY8uXpudjIKfmIk9tcbvzFbXYqLlIE++YFB
-SX+VoPbX1miI8EXa3tIw7t/C49uxi0SfMcb2wtKbtpNS8FioFnFWl+xP5iby3jU3
-u2mRfa8tbZxeTAmZY2yRAe/EA0HbdRlaDX5hOqG3jOLzwD8HFXu54S2vrpFQ0B5L
-fa5rdzmVvEmKFZ/SxatHd8NMs389EkY/JqQDemdFKYgTBoGBYTTFM1uFQMAPz7nF
-EBOtufq+52aGaLFVCCGaPKeVn7B+x9XSmG2DlWIH/JLzGer00AMIEa5ngmihIA8K
-eAiagugU78qVkykDTvlex/NYnNizc1Fn2r6i9RWlYUWZ
------END CERTIFICATE-----
\ No newline at end of file
+CSqGSIb3DQEBBQUAA4IBAQDesSxWe42V0ZjMXMQhJyXvESPd8Zv/j5HQeNv0MNHI
+23fgpFWvREW/c0ui9ADIzxauSm9VIVvHvM359Th27c8W8iKx8dz19QQc84Gj7kuM
+8gIXkUHpuR4rfemv1hdABtC4R2Hg7dGV2DA20ksp5f019mZ/SC8xpDkrdwedRvYt
+uyuIx99YU12jqWyTpamARncIJxNGxW4IPt4pebbg7oaX0h7sb4Tq5bNvdT0bzGtK
+q5IezI1xqflyEgUR/v/UyyQaoK/bBNJGg7Mrn27ibFHIEDThB/pZj8Wyd93BreMW
+ZgkcUbbIVDLoCtaKv46rHtTfR8uyBz6RhgoLJAj3Q7b3
+-----END CERTIFICATE-----

mail_notifier/notifier

@@ -11,7 +11,7 @@ mkdir -p "$base_folder"
 
 locker_stamp="$base_folder/.locked"
 msg_file="$locker_stamp/msg.mail"
-msmtp_cfg_file=/tmp/msmtp.cfg.$$
+msmtp_cfg_file="$locker_stamp/msmtp.cfg.$$"
 mail_stamp="sent_by_email"
 
 smtp_enabled=`uci get user_notify.smtp.enable`
@@ -165,6 +165,7 @@ send_mail() {
 	lock "$locker_stamp"
 	trap 'unlock "$locker_stamp"' EXIT ABRT QUIT TERM
 
+        create_msmtp_config
 	compose_message
 
 	if [ ! -f "$msg_file" ]; then
@@ -181,7 +182,6 @@ send_mail() {
 		cat "$msg_file" | msmtp -C "$msmtp_cfg_file" "$mail_to"
 		err_lvl=$?
 
-                rm -f "$msmtp_cfg_file"
 		if [ "$err_lvl" -eq 0 ]; then
                     mark_msgs
                 else
@@ -193,7 +193,6 @@ send_mail() {
 	unlock "$locker_stamp"
 }
 
-create_msmtp_config
 send_mail
 
 exec user-notify-cleaner