github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

4.1.0.0 

https://haproxy-wi.org/changelog.py#4_1
pull/221/head
Pavel Loginov 2020-03-23 19:56:09 +01:00
parent 658e8077c2
commit b78d07d824
5 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/scripts/ansible/roles/haproxy/tasks/main.yml
View File

@ -76,7 +76,9 @@
- name: Disble SELINUX in config - name: Disble SELINUX in config
shell: sed -i 's\SELINUX=enforcing\SELINUX=permissive\' /etc/selinux/config template:
src: selinux.j2
dest: /etc/selinux/config
- name: Disble SELINUX in env - name: Disble SELINUX in env

11
app/scripts/ansible/roles/haproxy/templates/selinux.j2 Normal file
View File

@ -0,0 +1,11 @@
# This file controls the state of SELinux on the system.
# SELINUX= can take one of these three values:
# enforcing - SELinux security policy is enforced.
# permissive - SELinux prints warnings instead of enforcing.
# disabled - No SELinux policy is loaded.
SELINUX=permissive
# SELINUXTYPE= can take one of three two values:
# targeted - Targeted processes are protected,
# minimum - Modification of targeted policy. Only selected processes are protected.
# mls - Multi Level Security protection.
SELINUXTYPE=targeted

4
app/scripts/ansible/roles/keepalived/tasks/install.yml
View File

@ -56,7 +56,9 @@
- name: Disble SELINUX in config - name: Disble SELINUX in config
shell: sed -i 's\SELINUX=enforcing\SELINUX=permissive\' /etc/selinux/config template:
src: ../../haproxy/templates/selinux.j2
dest: /etc/selinux/config
- name: Disble SELINUX in env - name: Disble SELINUX in env

8
app/scripts/ansible/roles/nginx.yml
View File

@ -46,11 +46,11 @@
name: "{{STATS_USER}}" name: "{{STATS_USER}}"
password: "{{STATS_PASS}}" password: "{{STATS_PASS}}"
when: "'nginx' not in ansible_facts.packages" when: "'nginx' not in ansible_facts.packages"
- name: Disble SELINUX in config - name: Disble SELINUX in config
shell: sed -i 's\SELINUX=enforcing\SELINUX=permissive\' /etc/selinux/config template:
src: /var/www/haproxy-wi/app/scripts/ansible/roles/haproxy/templates/selinux.j2
dest: /etc/selinux/config
- name: Disble SELINUX in env - name: Disble SELINUX in env
shell: setenforce 0 shell: setenforce 0

34
app/templates/base.html
View File

@ -235,23 +235,23 @@
</div> </div>
<div id="version"> <div id="version">
{% if versions is defined %} {% if versions is defined %}
{% set current_ver = versions.0 %} {% set current_ver = versions.0 %}
{% set new_ver = versions.1 %} {% set new_ver = versions.1 %}
{% set current_ver_without_dots = versions.2 %} {% set current_ver_without_dots = versions.2 %}
{% set new_ver_without_dots = versions.3 %} {% set new_ver_without_dots = versions.3 %}
{% endif %} {% endif %}
{% if new_ver_without_dots is defined and current_ver_without_dots is defined and new_ver is defined and new_ver_without_dots is defined %} {% if new_ver_without_dots is defined and current_ver_without_dots is defined and new_ver is defined and new_ver_without_dots is defined %}
<a style="color: #000; cursor: pointer;"> <a style="color: #000; cursor: pointer;">
{% if new_ver > current_ver and new_ver != "Sorry cannot get current version" %} {% if new_ver_without_dots > current_ver_without_dots and new_ver != "Sorry cannot get current version" %}
<span id="show-updates-button" class="new-version-exists">v{{current_ver}} </span> <span id="show-updates-button" class="new-version-exists">v{{current_ver}} </span>
{% else %} {% else %}
v{{current_ver}} v{{current_ver}}
{% endif %} {% endif %}
</a> </a>
{% else %} {% else %}
v{{current_ver}} v{{current_ver}}
{% endif %} {% endif %}
<br> <br>
</div> </div>
<div id="logo_footer"> <div id="logo_footer">
<a href="https://haproxy-wi.org" title="HAProxy-WI site" target="_blank"> <a href="https://haproxy-wi.org" title="HAProxy-WI site" target="_blank">