Merge branch 'master' into dist/eole/2.7.0/master

2020-12-17 10:49:40 +01:00 · 2019-06-07 15:26:16 +02:00 · 2019-04-15 14:20:33 +02:00 · 2019-04-12 10:12:46 +02:00
2 changed files with 7 additions and 7 deletions
--- a/4
+++ b/4
@ -1,9 +1,9 @@
 ################################
-# Makefile pour eole-prometheus
+# Makefile pour XXX-XXX
 ################################

 SOURCE=eole-prometheus
-VERSION=0.0.1
+VERSION=0.1
 EOLE_VERSION=2.7
 EOLE_RELEASE=2.7.0
 PKGAPPS=non
--- a/tmpl/alertmanager.yml
+++ b/tmpl/alertmanager.yml
@ -4,11 +4,11 @@ global:
  %if %%tls_smtp == "non"
  smtp_smarthost: '%%exim_relay_smtp:25'
  %elif %%tls_smtp == "port 25"
-  smtp_smarthost: '%%exim_relay_smtp:25'
-  smtp_require_tls: true
-  %else
-  smtp_smarthost: '%%exim_relay_smtp:465'
-  smtp_require_tls: true
+    smtp_smarthost: '%%exim_relay_smtp:25'
+    smtp_require_tls: true
+    %else
+    smtp_smarthost: '%%exim_relay_smtp:465'
+    smtp_require_tls: true
  %end if
  smtp_from: '%%system_mail_from'
 %else
Author	SHA1	Message	Date
vfebvre	638ef1da94	Merge branch 'master' into dist/eole/2.7.0/master	2020-12-17 10:49:40 +01:00
vincent	a1f14c7db7	Merge branch 'master' into dist/eole/2.7.0/master	2019-06-07 15:26:16 +02:00
William Petit	81a1679f43	Merge branch 'master' into dist/eole/2.7.0/master	2019-04-15 14:20:33 +02:00
vincent	0359dafc7c	packaging stable	2019-04-12 10:12:46 +02:00