library/roles/ckan/ckan/defaults/main.yml: Cleanup some typos.

library/roles/fusiondirectory: Install the fusiondirectory required schemas.

ckan/ckan/defaults/main.yml

@@ -54,10 +54,6 @@ ckan_ldap_username: uid
 ckan_ldap_email: mail
 ckan_ldap_prevent_edits: True
 ckan_ldap_fallback: True
-#ckan Spatial Search Widget configurations, using d4science.org account for MapBox
-ckanext.spatial.common_map.type: mapbox
-ckanext.spatial.common_map.mapbox.map_id: mapbox.satellite
-ckanext.spatial.common_map.mapbox.access_token: pk.eyJ1IjoiZDRzY2llbmNlIiwiYSI6ImNpcW1nZjE4MDAwMXNod25rdHJsemRoNTQifQ.YPNkNLb8EzjThpvJl1tg4w
 
 # Needed to install some CKAN plugins
 ckan_additional_packages:

fusiondirectory/defaults/main.yml

@@ -21,6 +21,15 @@ fusiondirectory_main_schemas:
   - fusiondirectory-schema
   - fusiondirectory-plugin-ssh-schema
 
+fusiondirectory_ldap_schemas:
+  - core-fd.schema
+  - core-fd-conf.schema
+  - ldapns.schema
+  - template-fd.schema
+  - openssh-lpk.schema
+  - nagios-fd-conf.schema
+  - netways.schema
+
 #fusiondirectory_plugins:
 
 #fusiondirectory_schemas:

fusiondirectory/tasks/manage-fd-schemas.yml

@@ -1,14 +1,19 @@
 ---
 - block:
 
-    - name: Install the fusiondirectory main schemas
+    - name: Install the fusiondirectory main schema packages
       apt: name={{ item }} state=present update_cache=yes
       with_items: '{{ fusiondirectory_main_schemas }}'
 
-    - name: Install the fusiondirectory additional schemas
+    - name: Install the fusiondirectory additional schema packages
       apt: name={{ item }} state=present
       with_items: '{{ fusiondirectory_schemas | default ([]) }}'
 
+    - name: Install the needed schemas on the ldap server
+      shell: fusiondirectory-insert-schema -i /etc/ldap/schema/fusiondirectory/{{ item }} ; touch /etc/ldap/schema/fusiondirectory/.{{ item }}.installed
+      with_items: '{{ fusiondirectory_ldap_schemas }}'
+      args:
+        creates: '/etc/ldap/schema/fusiondirectory/.{{ item }}.installed'
   when: fusiondirectory_schemas_install
   tags: [ 'fusiondirectory', 'fd_schemas' ]