v4.2.1.0

https://haproxy-wi.org/changelog.py#4_2_1

app/scripts/ansible/roles/haproxy/handlers/main.yml

@@ -1,3 +1,6 @@
 ---
 - name: restart haproxy
-  service: name=haproxy state=restarted
+  service: name=haproxy state=restarted
+  
+- name: restart rsyslog
+  service: name=rsyslog state=restarted

app/scripts/ansible/roles/haproxy/tasks/main.yml

@@ -74,18 +74,27 @@
     mode: 0644
   when: (ansible_facts['os_family'] == "RedHat" or ansible_facts['os_family'] == 'CentOS') and haproxy_from_wi is defined
   
-  
+
+- name: test to see if selinux is running
+  command: getenforce
+  register: sestatus
+  changed_when: false
+
+    
 - name: Disble SELINUX in config
   template:
    src: selinux.j2
    dest: /etc/selinux/config
   ignore_errors: yes
+  when: '"Enabled" in sestatus.stdout'
   
   
 - name: Disble SELINUX in env
-  shell: setenforce 0 2> /dev/null
+  shell: setenforce 0 &> /dev/null
   ignore_errors: yes
   debugger: never
+  when: '"Enabled" in sestatus.stdout'
+  
   
 - name: Enable and start service HAProxy
   systemd:
@@ -103,6 +112,21 @@
   when: "'haproxy' in ansible_facts.packages"
     
     
+- name: Installing HAProxy conf for rsyslog
+  template:
+   src: haproxy_rsyslog.conf.j2
+   dest: /etc/rsyslog.d/haproxy.conf
+  ignore_errors: yes
+  
+  
+- name: Installing rsyslog config
+  template:
+   src: rsyslog.conf
+   dest: /etc/rsyslog.conf
+  ignore_errors: yes
+  notify: restart rsyslog
+  
+    
 - name: Get HAProxy version.
   command: haproxy -v
   register: haproxy_version_result

app/scripts/ansible/roles/haproxy/templates/haproxy_rsyslog.conf.j2

@@ -0,0 +1,2 @@
+if $programname startswith 'haproxy' then /var/log/haproxy.log
+& stop

app/scripts/ansible/roles/haproxy/templates/rsyslog.conf

@@ -0,0 +1,91 @@
+# rsyslog configuration file
+
+# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html
+# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html
+
+#### MODULES ####
+
+# The imjournal module bellow is now used as a message source instead of imuxsock.
+$ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
+$ModLoad imjournal # provides access to the systemd journal
+#$ModLoad imklog # reads kernel messages (the same are read from journald)
+#$ModLoad immark  # provides --MARK-- message capability
+
+# Provides UDP syslog reception
+$ModLoad imudp
+$UDPServerRun 514
+
+# Provides TCP syslog reception
+$ModLoad imtcp
+$InputTCPServerRun 514
+
+
+#### GLOBAL DIRECTIVES ####
+
+# Where to place auxiliary files
+$WorkDirectory /var/lib/rsyslog
+
+# Use default timestamp format
+$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+
+# File syncing capability is disabled by default. This feature is usually not required,
+# not useful and an extreme performance hit
+#$ActionFileEnableSync on
+
+# Include all config files in /etc/rsyslog.d/
+$IncludeConfig /etc/rsyslog.d/*.conf
+
+# Turn off message reception via local log socket;
+# local messages are retrieved through imjournal now.
+$OmitLocalLogging on
+
+# File to store the position in the journal
+$IMJournalStateFile imjournal.state
+
+
+#### RULES ####
+
+# Log all kernel messages to the console.
+# Logging much else clutters up the screen.
+#kern.*                                                 /dev/console
+
+# Log anything (except mail) of level info or higher.
+# Don't log private authentication messages!
+*.info;mail.none;authpriv.none;cron.none                /var/log/messages
+
+# The authpriv file has restricted access.
+authpriv.*                                              /var/log/secure
+
+# Log all the mail messages in one place.
+mail.*                                                  -/var/log/maillog
+
+
+# Log cron stuff
+cron.*                                                  /var/log/cron
+
+# Everybody gets emergency messages
+*.emerg                                                 :omusrmsg:*
+
+# Save news errors of level crit and higher in a special file.
+uucp,news.crit                                          /var/log/spooler
+
+# Save boot messages also to boot.log
+local7.*                                                /var/log/boot.log
+
+
+# ### begin forwarding rule ###
+# The statement between the begin ... end define a SINGLE forwarding
+# rule. They belong together, do NOT split them. If you create multiple
+# forwarding rules, duplicate the whole block!
+# Remote Logging (we use TCP for reliable delivery)
+#
+# An on-disk queue is created for this action. If the remote host is
+# down, messages are spooled to disk and sent when it is up again.
+#$ActionQueueFileName fwdRule1 # unique name prefix for spool files
+#$ActionQueueMaxDiskSpace 1g   # 1gb space limit (use as much as possible)
+#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
+#$ActionQueueType LinkedList   # run asynchronously
+#$ActionResumeRetryCount -1    # infinite retries if host is down
+# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
+#*.* @@remote-host:514
+# ### end of the forwarding rule ###

app/scripts/ansible/roles/keepalived/tasks/install.yml

@@ -53,18 +53,28 @@
     dest: /etc/keepalived/keepalived.conf
     mode: 0644
   notify: restart keepalived
-  
+
+
+- name: test to see if selinux is running
+  command: getenforce
+  register: sestatus
+  changed_when: false
+
   
 - name: Disble SELINUX in config
   template:
    src: ../../haproxy/templates/selinux.j2
    dest: /etc/selinux/config
   ignore_errors: yes
+  when: '"Enabled" in sestatus.stdout'
+  
   
 - name: Disble SELINUX in env
   shell: setenforce 0 2> /dev/null
   ignore_errors: yes
   debugger: never
+  when: '"Enabled" in sestatus.stdout'
+  
   
 - name: Enable and start service keepalived
   service:

app/scripts/ansible/roles/nginx.yml

@@ -57,17 +57,28 @@
         name: "{{STATS_USER}}"
         password: "{{STATS_PASS}}"
       when: "'nginx' not in ansible_facts.packages"
+      
+      
+    - name: test to see if selinux is running
+      command: getenforce
+      register: sestatus
+      changed_when: false
+
           
     - name: Disble SELINUX in config
       template:
         src: /var/www/haproxy-wi/app/scripts/ansible/roles/haproxy/templates/selinux.j2
         dest: /etc/selinux/config
       ignore_errors: yes
-  
+      when: '"Enabled" in sestatus.stdout'
+      
+      
     - name: Disble SELINUX in env
-      shell: setenforce 0 2> /dev/null
+      shell: setenforce 0 
       ignore_errors: yes
       debugger: never
+      when: '"Enabled" in sestatus.stdout'
+      
       
 - hosts: "{{ variable_host }}"
   become: yes

config_other/syslog/haproxy.conf

@@ -1 +1,2 @@
-local2.*                       /var/log/haproxy.log
+if $programname startswith 'haproxy' then /var/log/haproxy.log
+& stop