Merge branch 'master' of github.com:kevinveenbirkenbach/infinito-nexus

roles/desk-nextcloud/config/main.yml

@@ -0,0 +1 @@
+{}

roles/desk-nextcloud/schema/main.yml

@@ -1 +1,5 @@
-cloud_fqdn: # @todo Add detailled scheme for this entry 
+credentials:
+  cloud_fqdn:
+    description: "Cloud fqdn"
+    algorithm:  "plain"
+    validation: "^.*$"

roles/desk-nextcloud/vars/main.yml

@@ -1,4 +1,4 @@
 application_id:                 desk-nextcloud
 nextcloud_user_home_directory:  "/home/{{ users[desktop_username].username }}/"
-nextcloud_cloud_fqdn:           "{{ applications | get_app_conf(application_id, 'cloud_fqdn') }}"
-nextcloud_cloud_directory:      '{{nextcloud_user_home_directory}}Clouds/{{nextcloud_cloud_fqdn}}/{{ users[desktop_username].username }}/'
+nextcloud_cloud_fqdn:           "{{ applications | get_app_conf(application_id, 'credentials.cloud_fqdn') }}"
+nextcloud_cloud_directory:      '{{ nextcloud_user_home_directory }}Clouds/{{nextcloud_cloud_fqdn}}/{{ users[desktop_username].username }}/'

roles/svc-opt-keyboard-color/config/main.yml

@@ -0,0 +1 @@
+vendor_and_product_id: 1038:113a # Default

roles/svc-opt-keyboard-color/schema/main.yml

@@ -1 +0,0 @@
-vendor_and_product_id: "" # @todo schema needs to be implemented

roles/svc-opt-keyboard-color/vars/main.yml

@@ -1,3 +1,3 @@
-application_id: svc-opt-keyboard-color
-system_service_id:   "{{ application_id }}"
+application_id:         svc-opt-keyboard-color
+system_service_id:      "{{ application_id }}"
 vendor_and_product_id:  "{{ applications | get_app_conf(application_id, 'vendor_and_product_id') }}"

roles/web-app-gitea/schema/main.yml

@@ -1 +1 @@
-credentials:
+credentials: {}

roles/web-app-magento/schema/main.yml

@@ -1,7 +1,9 @@
 credentials:
   adobe_public_key:
-      description: "Adobe/Magento Marketplace Public Key"
-      algorithm: "plain"
+    description: "Adobe/Magento Marketplace Public Key"
+    algorithm: "plain"
+    validation: "^.*$"
   adobe_private_key:
-      description: "Adobe/Magento Marketplace Private Key"
-      algorithm: "plain"
+    description: "Adobe/Magento Marketplace Private Key"
+    algorithm: "plain"
+    validation: "^.*$"

roles/web-app-oauth2-proxy/schema/main.yml

@@ -1,7 +1,6 @@
 # This file was created during refactoring to pass integration tests 
-# @todo add correct type
 credentials:
   oauth2_proxy_cookie_secret:
     description: "Cookie secret for OAuth2 Proxy (hex string, 32 characters, generated via `openssl rand -hex 16`)"
-    type: string
-    validation: "^[0-9A-Fa-f]{32}$"
+    algorithm:  "plain"
+    validation: "^.*$"

roles/web-app-openproject/schema/main.yml

@@ -1 +1 @@
-credentials:
+credentials: {}

roles/web-app-phpldapadmin/schema/main.yml

@@ -1 +1 @@
-credentials:
+credentials: {}

roles/web-app-phpmyadmin/schema/main.yml

@@ -1 +1 @@
-credentials:
+credentials: {}