From f5db89472ab1d10de2abb9045ae377a4ba262df8 Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Tue, 6 Aug 2019 18:03:56 +0200
Subject: [PATCH] fix linter errors
---
request-tracker/defaults/main.yml | 2 ++
request-tracker/tasks/main.yml | 2 +-
request-tracker/tasks/postgres.yml | 9 +++++++--
request-tracker/templates/RT_SiteConfig.d/70-ldap.pm.j2 | 4 ++--
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/request-tracker/defaults/main.yml b/request-tracker/defaults/main.yml
index 61864f9..0881a49 100644
--- a/request-tracker/defaults/main.yml
+++ b/request-tracker/defaults/main.yml
@@ -1,4 +1,6 @@
---
+
rt_enable_acmetool: false
rt_enable_nginx: true
rt_workers: 4
+rt_ldap_password: "{{ lookup('passwordstore', rt_ldappass) }}"
diff --git a/request-tracker/tasks/main.yml b/request-tracker/tasks/main.yml
index ebb1701..010909f 100644
--- a/request-tracker/tasks/main.yml
+++ b/request-tracker/tasks/main.yml
@@ -45,7 +45,7 @@
file:
path: /var/lib/request-tracker4/attachments
state: directory
- mode: u=rwx,g=rs
+ mode: "u=rwx,g=rs"
owner: www-data
tags:
- rt
diff --git a/request-tracker/tasks/postgres.yml b/request-tracker/tasks/postgres.yml
index bef8fd7..910f3d6 100644
--- a/request-tracker/tasks/postgres.yml
+++ b/request-tracker/tasks/postgres.yml
@@ -1,7 +1,9 @@
---
- name: Ensure the Postgres user exists
- postgresql_user: name=www-data state=present
+ postgresql_user:
+ name: www-data
+ state: present
become: true
become_user: postgres
tags:
@@ -9,7 +11,10 @@
- rt
- name: Ensure the Postgres DB exists
- postgresql_db: name=rtdb owner=www-data state=present
+ postgresql_db:
+ name: rtdb
+ owner: www-data
+ state: present
become: true
become_user: postgres
tags:
diff --git a/request-tracker/templates/RT_SiteConfig.d/70-ldap.pm.j2 b/request-tracker/templates/RT_SiteConfig.d/70-ldap.pm.j2
index 05116c7..f3170b3 100644
--- a/request-tracker/templates/RT_SiteConfig.d/70-ldap.pm.j2
+++ b/request-tracker/templates/RT_SiteConfig.d/70-ldap.pm.j2
@@ -1,7 +1,7 @@
### LDAP
Set($LDAPHost,'{{rt_ldaphost}}');
Set($LDAPUser,'{{rt_ldapuser}}');
-Set($LDAPPassword,'{{lookup('passwordstore', rt_ldappass)}}');
+Set($LDAPPassword,'{{ rt_ldap_password }}');
Set($LDAPBase,'{{rt_ldapbase}}');
Set($LDAPFilter, '(&(objectClass=user)(!(objectClass=computer))(uidNumber=*)(unixHomeDirectory=*)(!(userAccountControl:1.2.840.113556.1.4.803:=2)))');
Set($LDAPMapping, {Name => 'sAMAccountName', # required
@@ -30,7 +30,7 @@ Set($ExternalSettings, {
'type' => 'ldap',
'server' => '{{rt_ldaphost}}',
'user' => '{{rt_ldapuser}}',
- 'pass' => '{{lookup('passwordstore', rt_ldappass)}}',
+ 'pass' => '{{ rt_ldap_password }}',
'base' => '{{rt_ldapbase}}',
'filter' => '(&(objectClass=user)(!(objectClass=computer))(uidNumber=*)(unixHomeDirectory=*)(!(userAccountControl:1.2.840.113556.1.4.803:=2)))',
'attr_match_list' => ['Name', 'EmailAddress'],
--
GitLab