Rename options: http_auth_syscheck -> phpsyscheck_http_auth and http_auth_phpmyadmin -> phpmyadmin_http_auth, http_auth_phppgadmin -> phppgadmin_http_auth

roles/webserver/defaults/main.yml

@@ -39,7 +39,7 @@ phpsyscheck_vhostname: 'sys.localhost'
 phpsyscheck_vhostip: Null
 phpsyscheck_vhostport: Null
 phpsyscheck_ssl: False
-http_auth_syscheck: False
+phpsyscheck_http_auth: False
 
 php_config:
   date.timezone: 'Europe/Paris'
@@ -61,13 +61,13 @@ phpmyadmin_vhostname: 'pma.localhost'
 phpmyadmin_vhostip: Null
 phpmyadmin_vhostport: Null
 phpmyadmin_ssl: False
-http_auth_phpmyadmin: False
+phpmyadmin_http_auth: False
 
 with_phppgadmin: False
 phppgadmin_vhostname: 'pga.localhost'
 phppgadmin_vhostip: Null
 phppgadmin_vhostport: 80
-http_auth_phppgadmin: False
+phppgadmin_http_auth: False
 
 http_auth_admin_password: Null
 http_auth_user_name: Null

roles/webserver/templates/apache2/pga_vhost.j2

@@ -10,7 +10,7 @@
     DocumentRoot /usr/share/phppgadmin
     DirectoryIndex index.php
 
-{% if http_auth_phppgadmin %}
+{% if phppgadmin_http_auth %}
     <Location />
         AuthType basic
         AuthName "Restricted Access"

roles/webserver/templates/apache2/pma_vhost.j2

@@ -15,7 +15,7 @@
     DocumentRoot /usr/share/phpmyadmin
     DirectoryIndex index.php
 
-{% if http_auth_phpmyadmin %}
+{% if phpmyadmin_http_auth %}
     <Location />
         AuthType basic
         AuthName "Restricted Access"
@@ -65,7 +65,7 @@
     DocumentRoot /usr/share/phpmyadmin
     DirectoryIndex index.php
 
-{% if http_auth_phpmyadmin %}
+{% if phpmyadmin_http_auth %}
     <Location />
         AuthType basic
         AuthName "Restricted Access"

roles/webserver/templates/apache2/sys_vhost.j2

@@ -15,7 +15,7 @@
     DocumentRoot /etc/phpsyscheck
     DirectoryIndex index.php
 
-{% if http_auth_syscheck %}
+{% if phpsyscheck_http_auth %}
     <Location />
         AuthType basic
         AuthName "Restricted Access"
@@ -54,7 +54,7 @@
     DocumentRoot /etc/phpsyscheck
     DirectoryIndex index.php
 
-{% if http_auth_syscheck %}
+{% if phpsyscheck_http_auth %}
     <Location />
         AuthType basic
         AuthName "Restricted Access"

roles/webserver/templates/nginx/pga_vhost.j2

@@ -16,7 +16,7 @@ server {
     index index.php;
     try_files $uri $uri/ /index.php;
 
-{% if http_auth_phppgadmin %}
+{% if phppgadmin_http_auth %}
     auth_basic "Restricted Access";
     auth_basic_user_file /etc/nginx/auth_admin;
 {% endif %}

roles/webserver/templates/nginx/pma_vhost.j2

@@ -27,7 +27,7 @@ server {
     index index.php;
     try_files $uri $uri/ /index.php;
 
-{% if http_auth_phpmyadmin %}
+{% if phpmyadmin_http_auth %}
     auth_basic "Restricted Access";
     auth_basic_user_file /etc/nginx/auth_admin;
 {% endif %}
@@ -61,7 +61,7 @@ server {
     index index.php;
     try_files $uri $uri/ /index.php;
 
-{% if http_auth_phpmyadmin %}
+{% if phpmyadmin_http_auth %}
     auth_basic "Restricted Access";
     auth_basic_user_file /etc/nginx/auth_admin;
 {% endif %}

roles/webserver/templates/nginx/sys_vhost.j2

@@ -27,7 +27,7 @@ server {
     index index.php;
     try_files $uri $uri/ /index.php;
 
-{% if http_auth_syscheck %}
+{% if phpsyscheck_http_auth %}
     auth_basic "Restricted Access";
     auth_basic_user_file /etc/nginx/auth_admin;
 {% endif %}
@@ -53,7 +53,7 @@ server {
     index index.php;
     try_files $uri $uri/ /index.php;
 
-{% if http_auth_syscheck %}
+{% if phpsyscheck_http_auth %}
     auth_basic "Restricted Access";
     auth_basic_user_file /etc/nginx/auth_admin;
 {% endif %}