fix wait-for-it.sh permissions, add rocketchat admin info

devopswise · May 9, 2019 · 9564fcf · 9564fcf
1 parent db683eb
commit 9564fcf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/roles/gitea/tasks/main.yml b/roles/gitea/tasks/main.yml
@@ -19,6 +19,7 @@
 - name: generate a random mysql password
   set_fact:
     gitea_mysql_pass: "{{ lookup('password', '../credentials/gitea_mysql_pass chars=ascii_letters,digits,hexdigits length=12') }}"
+    openldap_admin_pass: "{{ lookup('password', '../credentials/openldap_admin_pass chars=ascii_letters,digits,hexdigits length=12') }}"
 
 - name: sync docker-compose.yml
   template:
@@ -40,6 +41,7 @@
   copy:
     src: wait-for-it.sh
     dest: /tmp/{{ gitea_service_name }}/wait-for-it.sh
+    mode: 0755
   become: yes
   become_method: sudo
 

diff --git a/roles/rocketchat/templates/docker-compose.yml.j2 b/roles/rocketchat/templates/docker-compose.yml.j2
@@ -14,6 +14,9 @@ services:
         MONGO_URL: "mongodb://rocketchat:{{ rocketchat_mongodb_pass }}@mongodb:27017/rocketchat"
         NODE_TLS_REJECT_UNAUTHORIZED: "0"
         SSL_CERT_DIR: "/etc/ssl/certs"
+        ADMIN_USERNAME: local.admin
+        ADMIN_PASS: {{ openldap_admin_pass }}
+        ADMIN_EMAIL: {{ admin_email }}
         OVERWRITE_SETTING_Show_Setup_Wizard: "completed"
     labels:
       - traefik.backend=rocketchat