diff --git a/smardigo/provisioning/form/simple-connect.json b/smardigo/provisioning/form/simple-connect.json
index 5859d4a..932fccf 100644
--- a/smardigo/provisioning/form/simple-connect.json
+++ b/smardigo/provisioning/form/simple-connect.json
@@ -50,7 +50,40 @@
"label" : "Columns",
"columns" : [ {
"components" : [ {
- "label" : "connect_client_admin_password",
+ "label" : "connect_admin_username",
+ "allowMultipleMasks" : false,
+ "showWordCount" : false,
+ "showCharCount" : false,
+ "clearOnHide" : false,
+ "disabled" : true,
+ "tableView" : true,
+ "alwaysEnabled" : false,
+ "type" : "textfield",
+ "input" : true,
+ "key" : "connect_admin_username",
+ "defaultValue" : "",
+ "validate" : {
+ "customMessage" : "",
+ "json" : ""
+ },
+ "conditional" : {
+ "show" : "",
+ "when" : "",
+ "json" : ""
+ },
+ "tabs" : null,
+ "inputFormat" : "plain",
+ "encrypted" : false,
+ "properties" : { },
+ "tags" : [ ],
+ "customConditional" : "",
+ "logic" : [ ],
+ "widget" : {
+ "type" : ""
+ },
+ "reorder" : false
+ }, {
+ "label" : "connect_admin_password",
"hideLabel" : true,
"labelPosition" : "left-left",
"showWordCount" : false,
@@ -61,7 +94,7 @@
"alwaysEnabled" : false,
"type" : "textfield",
"input" : true,
- "key" : "connect_client_admin_password",
+ "key" : "connect_admin_password",
"defaultValue" : "",
"validate" : {
"customMessage" : "",
@@ -208,6 +241,39 @@
"tableView" : true,
"label" : "Column",
"components" : [ {
+ "label" : "wordpress_admin_username",
+ "allowMultipleMasks" : false,
+ "showWordCount" : false,
+ "showCharCount" : false,
+ "clearOnHide" : false,
+ "disabled" : true,
+ "tableView" : true,
+ "alwaysEnabled" : false,
+ "type" : "textfield",
+ "input" : true,
+ "key" : "wordpress_admin_username",
+ "defaultValue" : "",
+ "validate" : {
+ "customMessage" : "",
+ "json" : ""
+ },
+ "conditional" : {
+ "show" : "",
+ "when" : "",
+ "json" : ""
+ },
+ "tabs" : null,
+ "inputFormat" : "plain",
+ "encrypted" : false,
+ "properties" : { },
+ "tags" : [ ],
+ "customConditional" : "show = data['connect-features'].includes(\"connect_wordpress\") ",
+ "logic" : [ ],
+ "widget" : {
+ "type" : ""
+ },
+ "reorder" : false
+ }, {
"label" : "wordpress_admin_password",
"hideLabel" : true,
"labelPosition" : "left-left",
@@ -299,6 +365,39 @@
"tableView" : true,
"label" : "Column",
"components" : [ {
+ "label" : "keycloak_admin_username",
+ "allowMultipleMasks" : false,
+ "showWordCount" : false,
+ "showCharCount" : false,
+ "clearOnHide" : false,
+ "disabled" : true,
+ "tableView" : true,
+ "alwaysEnabled" : false,
+ "type" : "textfield",
+ "input" : true,
+ "key" : "keycloak_admin_username",
+ "defaultValue" : "",
+ "validate" : {
+ "customMessage" : "",
+ "json" : ""
+ },
+ "conditional" : {
+ "show" : "",
+ "when" : "",
+ "json" : ""
+ },
+ "tabs" : null,
+ "inputFormat" : "plain",
+ "encrypted" : false,
+ "properties" : { },
+ "tags" : [ ],
+ "customConditional" : "",
+ "logic" : [ ],
+ "widget" : {
+ "type" : ""
+ },
+ "reorder" : false
+ }, {
"label" : "keycloak_admin_password",
"hideLabel" : true,
"labelPosition" : "left-left",
diff --git a/smardigo/provisioning/mail-template/smardigo-up-and-running.html b/smardigo/provisioning/mail-template/smardigo-up-and-running.html
new file mode 100644
index 0000000..d5528ec
--- /dev/null
+++ b/smardigo/provisioning/mail-template/smardigo-up-and-running.html
@@ -0,0 +1,58 @@
+
+
+
+ Neue Smardigo-Instanz erfolgreich aufgesetzt
+
+ Sehr geehrte Damen und Herren,
+
+
+
+ ihre Smardigo-Instanz ist nun einsatzbereit.
+
+
+ Zum Abschließen der Installation müssen Sie sich mit den folgend angegebenen initialen Zugangsdaten
+ anmelden. Sie werden danach aufgefordert, ihre eigenen Passwörter zu setzen. Beachten Sie, dass die
+ zugehörigen Benutzer über alle Ihre Smardigo-Instanzen hin geteilt werden. Die initialen Passwörter
+ können nur für die aller erste Anmeldung verwendet werden. Von Ihnen gesetzte Passwörter werden nicht
+ überschrieben.
+
+
+
+
+ Service
+ Benutzer
+ Passwort
+ Link
+
+
+ Connect
+ ${ connect_admin_username }
+ ${ connect_admin_password }
+ https://${ cluster.stage }-${ tenant.key }-${ cluster.name }-01-connect.smardigo.digital
+
+
+ Keycloak
+ ${ keycloak_admin_username }
+ ${ keycloak_admin_password }
+ https://${ cluster.stage }-keycloak-01.smardigo.digital/auth/admin/${ tenant.key }/console
+
+
+ Wordpress
+ ${ wordpress_admin_username }
+ ${ wordpress_admin_password }
+ https://${ cluster.stage }-${ tenant.key }-${ cluster.name }-01-wordpress.smardigo.digital
+
+
+
+
+ Hier geht es zum Antrag: Link
+
+
+ Hinweis: Diese Mail wurde durch Smardigo automatisch erzeugt.
+
+
+
diff --git a/smardigo/provisioning/process-variable-declaration/simple-connect.json b/smardigo/provisioning/process-variable-declaration/simple-connect.json
index d7b0c07..f2f25fd 100644
--- a/smardigo/provisioning/process-variable-declaration/simple-connect.json
+++ b/smardigo/provisioning/process-variable-declaration/simple-connect.json
@@ -23,7 +23,11 @@
"type" : "object",
"classification" : "PRIVATE"
},
- "connect_client_admin_password" : {
+ "connect_admin_password" : {
+ "type" : "string",
+ "classification" : "PRIVATE"
+ },
+ "connect_admin_username" : {
"type" : "string",
"classification" : "PRIVATE"
},
@@ -63,6 +67,10 @@
"type" : "string",
"classification" : "PRIVATE"
},
+ "keycloak_admin_username" : {
+ "type" : "string",
+ "classification" : "PRIVATE"
+ },
"name" : {
"type" : "string",
"classification" : "PRIVATE"
@@ -122,6 +130,10 @@
"wordpress_admin_password" : {
"type" : "string",
"classification" : "PRIVATE"
+ },
+ "wordpress_admin_username" : {
+ "type" : "string",
+ "classification" : "PRIVATE"
}
}
}
\ No newline at end of file
diff --git a/smardigo/provisioning/process/simple-connect.bpmn b/smardigo/provisioning/process/simple-connect.bpmn
index 2880a69..eb165e4 100644
--- a/smardigo/provisioning/process/simple-connect.bpmn
+++ b/smardigo/provisioning/process/simple-connect.bpmn
@@ -76,13 +76,16 @@
-
+
wordpress-admin
+ connect-realm-admin
+ wordpress-admin
+ connect-admin
Flow_1rtcnw8
@@ -254,27 +257,8 @@
Flow_1r4otto
Flow_1u7vy0j
-
- Flow_1u7vy0j
- Flow_1gzjfsr
- Flow_0d1wzgo
-
-
- Flow_0d1wzgo
-
-
-
-
- ${50}
- Service gestartet
-
-
- Flow_1gzjfsr
- Flow_15fkmn4
-
- Flow_15fkmn4
+ Flow_1381iar
Flow_0yh3rtc
Flow_1c2a31w
@@ -926,7 +910,7 @@ Variables.userId(authenticatedUserId)
+ Flow_1u7vy0j
+ Flow_1gzjfsr
+ Flow_0d1wzgo
+
+
+ Flow_0d1wzgo
+
+
+
+
+ ${50}
+ Service gestartet
+
+
+ Flow_10y7ypm
+ Flow_1381iar
+
+
+
+
+
+
+
+ processes.byId(contextScopeId, contextProcessId).getAttachmentsByTag('email').collect { it.id }
+
+ ${creation_user_id}
+ Neue Smardigo Instanz
+ template(smardigo-up-and-running.html)
+
+
+ Flow_1gzjfsr
+ Flow_10y7ypm
+
-
-
-
-
+
+
+
+
@@ -1558,6 +1585,25 @@ processes.byId(contextScopeId, contextProcessId).createComment('current_job_id :
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1614,21 +1660,6 @@ processes.byId(contextScopeId, contextProcessId).createComment('current_job_id :
-
-
-
-
-
-
-
-
-
-
diff --git a/smardigo/provisioning/script/ansible-start.groovy b/smardigo/provisioning/script/ansible-start.groovy
index d5d9b74..23a7e09 100644
--- a/smardigo/provisioning/script/ansible-start.groovy
+++ b/smardigo/provisioning/script/ansible-start.groovy
@@ -13,8 +13,12 @@ def env = [
smardigo_management_action: smardigoManagementAction,
stage: cluster.stage,
tenant_id: tenant.key,
- connect_client_admin_password: connect_client_admin_password,
- connect_realm_admin_password: keycloak_admin_password
+ connect_client_admin_username: connect_admin_username,
+ connect_client_admin_password: connect_admin_password,
+ connect_realm_admin_username: keycloak_admin_username,
+ connect_realm_admin_password: keycloak_admin_password,
+ wordpress_admin_username: wordpress_admin_username,
+ wordpress_admin_password: wordpress_admin_password
]
if (binding.hasVariable('extraVariables')) {
env << extraVariables
diff --git a/smardigo/provisioning/script/create-awx-paramaters.groovy b/smardigo/provisioning/script/create-awx-paramaters.groovy
index f9323e1..111db82 100644
--- a/smardigo/provisioning/script/create-awx-paramaters.groovy
+++ b/smardigo/provisioning/script/create-awx-paramaters.groovy
@@ -13,8 +13,12 @@ def env = [
smardigo_management_action: smardigoManagementAction,
stage: cluster.stage,
tenant_id: tenant.key,
- connect_client_admin_password: connect_client_admin_password,
- connect_realm_admin_password: keycloak_admin_password
+ connect_client_admin_username: connect_admin_username,
+ connect_client_admin_password: connect_admin_password,
+ connect_realm_admin_username: keycloak_admin_username,
+ connect_realm_admin_password: keycloak_admin_password,
+ wordpress_admin_username: wordpress_admin_username,
+ wordpress_admin_password: wordpress_admin_password
]
if (binding.hasVariable('extraVariables')) {
env << extraVariables