Version 1.0.0

ANXS · Mar 14, 2014 · 87ce77d · 87ce77d
1 parent 2827354
commit 87ce77d
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/templates/etc_monit_monitrc.j2 b/templates/etc_monit_monitrc.j2
@@ -26,11 +26,11 @@ set idfile /var/lib/monit/id
 set statefile /var/lib/monit/state
 
 set mailserver {{monit_mailserver_host}} {% if monit_mailserver_port is defined %}{{monit_mailserver_port}}{% endif %}
-{% if monit_mailserver_username is defined %}  username "{{monit_mailserver_username}}"{% endif %}
-{% if monit_mailserver_password is defined %}  password "{{monit_mailserver_password}}"{% endif %}
-{% if monit_mailserver_encryption is defined %}  using {{monit_mailserver_encryption}}{% endif %}
-{% if monit_mailserver_timeout is defined %}  with timeout {{monit_mailserver_timeout}}{% endif %}
 
+{% if monit_mailserver_username is defined %}  username "{{monit_mailserver_username}}"{{'\n'}}{% endif %}
+{% if monit_mailserver_password is defined %}  password "{{monit_mailserver_password}}"{{'\n'}}{% endif %}
+{% if monit_mailserver_encryption is defined %}  using {{monit_mailserver_encryption}}{{'\n'}}{% endif %}
+{% if monit_mailserver_timeout is defined %}  with timeout {{monit_mailserver_timeout}} seconds{{'\n'}}{% endif %}
 
 set eventqueue
   basedir {{monit_eventqueue_directory}}
@@ -45,8 +45,8 @@ set mail-format {
 set alert {{monit_notify_email}} NOT ON { action, instance, pid, ppid }
 
 set httpd port {{monit_port}}
-{% if monit_address is defined %}  use address {{monit_address}}{% endif %}
-{% for a in monit_allow %}  allow {{a}}{% endfor %}
+{% if monit_address is defined %}  use address {{monit_address}}{{'\n'}}{% endif %}
+{% for a in monit_allow %}  allow {{a}}{{'\n'}}{% endfor %}
 {% if monit_ssl %}  ssl enable
   pemfile {{monit_cert}}
 {% endif %}