ldap: support nextcloud_ldap_expert_username_attr setting

defaults/main.yml

@@ -1,39 +1,82 @@
 ---
 # domain, webroot
-roundcube_domain: default
+nextcloud_domain: example.com
-roundcube_web_root: /roundcube
+nextcloud_web_root: /
-roundcube_version: 1.3.10
 
-# container
+# database
-roundcube_image: eumau/roundcubemail:{{ roundcube_version }}
+nextcloud_db_engine: sqlite
-roundcube_container: roundcube
+
-roundcube_volume: roundcube
+# db name or path (sqlite)
+nextcloud_db_name: nextcloud
 
 # mysql, mariadb, postgresql
-roundcube_db_type: sqlite
+nextcloud_db_host: localhost
-roundcube_db_host: localhost
+nextcloud_db_user: nextcloud
-roundcube_db_port: "{{ '5432' if 'post' in roundcube_db_type else '3306' }}"
+nextcloud_db_password: password
-roundcube_db_user: roundcube
+nextcloud_table_prefix: ""
-roundcube_db_password: password
-roundcube_db_name:
-  roundcube{{ '.sqlite' if roundcube_db_type == 'sqlite' else '' }}
 
 # data dir (inside container)
-roundcube_data_dir: /var/www/html
+nextcloud_data_dir: /var/www/html/data
 
-# imap
+# admin user
-roundcube_imap_host: "tls://{{ dovecot_container | default('localhost') }}"
+nextcloud_admin_user: admin
-roundcube_imap_port: "143"
+nextcloud_admin_password: password
+
+# space separated trusted domains
+nextcloud_trusted_domains:
+  - "{{ nextcloud_domain }}"
+
+# The install and update script is only triggered when a default command
+# is used (apache-foreground or php-fpm). If you use a custom command
+# you have to enable the install / update with
+nextcloud_update: ""
+
+# The use of Redis is recommended to prevent file locking problems. See
+# the examples for further instructions.
+# If you want to use Redis you have to create a separate Redis container
+# in your setup / in your docker-compose file. To inform Nextcloud about
+# the Redis container add:
+nextcloud_redis_host: ""
+nextcloud_redis_port: "6379"
 
 # smtp
-roundcube_smtp_host: "tls://{{ postfix_container | default('localhost') }}"
+nextcloud_smtp_host: ""
-roundcube_smtp_port: "587"
+nextcloud_smtp_secure: ""
+nextcloud_smtp_port: ""
+nextcloud_smtp_authtype: LOGIN
+nextcloud_smtp_user: ""
+nextcloud_smtp_password: ""
+nextcloud_mail_from_address: ""
+nextcloud_mail_domain: "{{ nextcloud_domain }}"
 
-# plugins
+# ldap
-roundcube_plugins: []
+nextcloud_ldap_enable: false
+nextcloud_ldap_host: "{{ ldap_uri | default('openldap') | regex_replace(':[0-9]+$') }}"
+nextcloud_ldap_port: "389"
+#nextcloud_ldap_backup_host: ""
+nextcloud_ldap_backup_port: "389"
+#nextcloud_ldap_agent_name: ""
+#nextcloud_ldap_agent_password: ""
+nextcloud_ldap_base: "dc={{ openldap_domain | default('example.com') | replace('.', ',dc=') }}"
+#nextcloud_ldap_base_users: ""
+#nextcloud_ldap_base_groups: ""
+#nextcloud_ldap_user_filter_objectclass: ""
+#nextcloud_ldap_user_filter: ""
+#nextcloud_ldap_login_filter: ""
+#nextcloud_ldap_group_filter_objectclass: ""
+#nextcloud_ldap_group_filter: ""
+#nextcloud_ldap_gid_number: ""
+#nextcloud_ldap_user_display_name: ""
+#nextcloud_ldap_user_display_name_2: ""
+#nextcloud_ldap_group_display_name: ""
+#nextcloud_ldap_email_attribute: ""
+#nextcloud_ldap_group_member_assoc_attr: ""
+#nextcloud_ldap_expert_username_attr: ""
 
-# upload max filesize
+# container
-roundcube_upload_max_filesize: 40M
+nextcloud_image: eumau/nextcloud
+nextcloud_container: nextcloud
+nextcloud_volume: nextcloud
 
 # definido por rol docker
-docker_network_name: dockernet
+docker_network: dockernet

tasks/main.yml

@@ -1,108 +1,133 @@
 ---
 # TODO: postgres support
-# - name: create roundcube database (pg)
+# - name: create nextcloud database (pg)
 #   postgresql_db:
 #     state: present
-#     name: "{{ roundcube_db_name }}"
+#     name: "{{ nextcloud_db_name }}"
 #     login_host: "{{ postgresql_host }}"
 #     login_port: "{{ postgresql_port }}"
 #     login_user: "{{ postgresql_root_password }}"
 #     login_password: "{{ postgresql_root_password }}"
 
-# - name: create roundcube db user (pg)
+# - name: create nextcloud db user (pg)
 #   postgresql_user:
 #     state: present
-#     name: "{{ roundcube_db_user }}"
+#     name: "{{ nextcloud_db_user }}"
-#     password: "{{ roundcube_db_password }}"
+#     password: "{{ nextcloud_db_password }}"
-#     priv: "{{ roundcube_db_name }}.*:ALL"
+#     priv: "{{ nextcloud_db_name }}.*:ALL"
 #     login_host: "{{ postgresql_host }}"
 #     login_port: "{{ postgresql_port }}"
 #     login_user: root
 #     login_password: "{{ postgresql_root_password }}"
 
-- name: create roundcube database
+- name: create nextcloud database
   mysql_db:
     state: present
-    name: "{{ roundcube_db_name }}"
+    name: "{{ nextcloud_db_name }}"
     login_host: "{{ mariadb_host }}"
     login_port: "{{ mariadb_port }}"
     login_user: root
     login_password: "{{ mariadb_root_password }}"
-  when: roundcube_db_type in ('mariadb','mysql')
+  when: nextcloud_db_engine in ('mariadb','mysql')
 
-- name: create roundcube db user
+- name: create nextcloud db user
   mysql_user:
     state: present
-    name: "{{ roundcube_db_user }}"
+    name: "{{ nextcloud_db_user }}"
     host: "%"
-    password: "{{ roundcube_db_password }}"
+    password: "{{ nextcloud_db_password }}"
-    priv: "{{ roundcube_db_name }}.*:ALL"
+    priv: "{{ nextcloud_db_name }}.*:ALL"
     login_host: "{{ mariadb_host }}"
     login_port: "{{ mariadb_port }}"
     login_user: root
     login_password: "{{ mariadb_root_password }}"
-  when: roundcube_db_type in ('mariadb','mysql')
+  when: nextcloud_db_engine in ('mariadb','mysql')
 
-- name: start roundcube container
+- name: start nextcloud container
   docker_container:
-    image: "{{ roundcube_image }}"
+    image: "{{ nextcloud_image }}"
-    name: "{{ roundcube_container }}"
+    name: "{{ nextcloud_container }}"
     volumes:
-      - "{{ roundcube_volume }}:/var/www/html"
+      - "{{ nextcloud_volume }}:/var/www/html"
     env:
-      ROUNDCUBEMAIL_DEFAULT_HOST: "{{ roundcube_imap_host }}"
+      SQLITE_DATABASE:
-      ROUNDCUBEMAIL_DEFAULT_PORT: "{{ roundcube_imap_port }}"
+        "{{ nextcloud_db_name if nextcloud_db_engine == 'sqlite' else '' }}"
-      ROUNDCUBEMAIL_SMTP_SERVER: "{{ roundcube_smtp_host }}"
+      MYSQL_DATABASE:
-      ROUNDCUBEMAIL_SMTP_PORT: "{{ roundcube_smtp_port }}"
+        "{{ nextcloud_db_name if nextcloud_db_engine in ('mysql','mariadb') else '' }}"
-      ROUNDCUBEMAIL_PLUGINS: "{{ roundcube_plugins | join (',') }}"
+      MYSQL_USER:
-      ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE: "{{ roundcube_upload_max_filesize }}"
+        "{{ nextcloud_db_user if nextcloud_db_engine in ('mysql','mariadb') else '' }}"
-      ROUNDCUBEMAIL_DB_TYPE: "{{ roundcube_db_type }}"
+      MYSQL_PASSWORD:
-      ROUNDCUBEMAIL_DB_HOST: "{{ roundcube_db_host }}"
+        "{{ nextcloud_db_password if nextcloud_db_engine in ('mysql','mariadb') else '' }}"
-      ROUNDCUBEMAIL_DB_PORT: "{{ roundcube_db_port }}"
+      MYSQL_HOST:
-      ROUNDCUBEMAIL_DB_USER: "{{ roundcube_db_user }}"
+        "{{ nextcloud_db_host if nextcloud_db_engine in ('mysql','mariadb') else '' }}"
-      ROUNDCUBEMAIL_DB_PASSWORD: "{{ roundcube_db_password }}"
+      POSTGRES_DB:
-      ROUNDCUBEMAIL_DB_NAME: "{{ roundcube_db_name }}"
+        "{{ nextcloud_db_name if 'postgres' in nextcloud_db_engine else '' }}"
+      POSTGRES_USER:
+        "{{ nextcloud_db_user if 'postgres' in nextcloud_db_engine else '' }}"
+      POSTGRES_PASSWORD:
+        "{{ nextcloud_db_password if 'postgres' in nextcloud_db_engine else '' }}"
+      POSTGRES_HOST:
+        "{{ nextcloud_db_host if 'postgres' in nextcloud_db_engine else '' }}"
+      NEXTCLOUD_TABLE_PREFIX: "{{ nextcloud_table_prefix }}"
+      NEXTCLOUD_ADMIN_USER: "{{ nextcloud_admin_user }}"
+      NEXTCLOUD_ADMIN_PASSWORD: "{{ nextcloud_admin_password }}"
+      NEXTCLOUD_TRUSTED_DOMAINS: "{{ nextcloud_trusted_domains | join(' ')}}"
+      NEXTCLOUD_UPDATE: "{{ nextcloud_update }}"
+      REDIS_HOST: "{{ nextcloud_redis_host }}"
+      REDIS_HOST_PORT: "{{ nextcloud_redis_port }}"
+      SMTP_HOST: "{{ nextcloud_smtp_host }}"
+      SMTP_SECURE: "{{ nextcloud_smtp_secure }}"
+      SMTP_PORT: "{{ nextcloud_smtp_port }}"
+      SMTP_AUTHTYPE: "{{ nextcloud_smtp_authtype }}"
+      SMTP_NAME: "{{ nextcloud_smtp_user }}"
+      SMTP_PASSWORD: "{{ nextcloud_smtp_password }}"
+      MAIL_FROM_ADDRESS: "{{ nextcloud_mail_from_address }}"
+      MAIL_DOMAIN: "{{ nextcloud_mail_domain }}"
+      LDAP_ENABLE: "{{ 'true' if nextcloud_ldap_enable else 'false' }}"
+      LDAP_HOST: "{{ nextcloud_ldap_host }}"
+      LDAP_PORT: "{{ nextcloud_ldap_port | string }}"
+      LDAP_BACKUP_HOST: "{{ nextcloud_ldap_backup_host | default(omit) }}"
+      LDAP_BACKUP_PORT: "{{ nextcloud_ldap_backup_port | string }}"
+      LDAP_AGENT_NAME: "{{ nextcloud_ldap_agent_name | default(omit) }}"
+      LDAP_AGENT_PASSWORD: "{{ nextcloud_ldap_agent_password | default(omit) }}"
+      LDAP_BASE: "{{ nextcloud_ldap_base }}"
+      LDAP_BASE_USERS: "{{ nextcloud_ldap_base_users | default(omit) }}"
+      LDAP_BASE_GROUPS: "{{ nextcloud_ldap_base_groups | default(omit) }}"
+      LDAP_USER_FILTER_OBJECTCLASS: "{{ nextcloud_ldap_user_filter_objectclass | default(omit) }}"
+      LDAP_USER_FILTER: "{{ nextcloud_ldap_user_filter | default(omit) }}"
+      LDAP_LOGIN_FILTER: "{{ nextcloud_ldap_login_filter | default(omit) }}"
+      LDAP_GROUP_FILTER_OBJECTCLASS: "{{ nextcloud_ldap_group_filter_objectclass | default(omit) }}"
+      LDAP_GROUP_FILTER: "{{ nextcloud_ldap_group_filter | default(omit) }}"
+      LDAP_GID_NUMBER: "{{ nextcloud_ldap_gid_number | default(omit) }}"
+      LDAP_USER_DISPLAY_NAME: "{{ nextcloud_ldap_user_display_name | default(omit) }}"
+      LDAP_USER_DISPLAY_NAME_2: "{{ nextcloud_ldap_user_display_name_2 | default(omit) }}"
+      LDAP_GROUP_DISPLAY_NAME: "{{ nextcloud_ldap_group_display_name | default(omit) }}"
+      LDAP_EMAIL_ATTRIBUTE: "{{ nextcloud_ldap_email_attribute | default(omit) }}"
+      LDAP_GROUP_MEMBER_ASSOC_ATTR: "{{ nextcloud_ldap_group_member_assoc_attr | default(omit) }}"
+      LDAP_EXPERT_USERNAME_ATTR: "{{ nextcloud_ldap_expert_username_attr | default(omit) }}"
     networks:
-      - name: "{{ docker_network_name }}"
+      - name: "{{ docker_network }}"
     ports:
 
 - name: export nginx config
   set_fact:
     nginx_config: >-
       {{ nginx_config | default({}) | combine({
-        roundcube_domain: {
+        nextcloud_domain: {
           "locations": {
-            roundcube_web_root.rstrip('/')+'/': {
+            '/': {
-              "proxy_pass": "http://{}:9080/".format(roundcube_container)
+              "proxy_pass": "https://{}:9010".format(nextcloud_container)
             }
           }
         }
         }, recursive=True) }}
 
-- name: inspect roundcube volume
+- name: inspect nextcloud volume
   docker_volume_info:
-    name: "{{ roundcube_volume }}"
+    name: "{{ nextcloud_volume }}"
   register: volinfo
 
 - name: export variables
   set_fact:
-    roundcube_volume: "{{ lookup('vars','roundcube_volume') }}"
+    nextcloud_volume: "{{ lookup('vars','nextcloud_volume') }}"
-    roundcube_volume_mountpoint: "{{ volinfo.volume.Mountpoint }}"
+    nextcloud_volume_mountpoint: "{{ volinfo.volume.Mountpoint }}"
-
-- name: allow self-signed mail server certs
-  blockinfile:
-    state: present
-    path: "{{ roundcube_volume_mountpoint }}/config/config.inc.php"
-    block: |
-      $config['imap_conn_options'] = array(
-        'ssl' => array(
-          'verify_peer' => false,
-          'verify_peer_name' => false,
-        ),
-      );
-      $config['smtp_conn_options'] = array(
-        'ssl' => array(
-          'verify_peer' => false,
-          'verify_peer_name' => false,
-        ),
-      );