Revert "tmp"

This reverts commit 9275cf4672.
feature/DEV-470_2nd
Sven Ketelsen 4 years ago
parent 9275cf4672
commit 1ebcce5a17

@ -47,357 +47,103 @@
"logic" : [ ], "logic" : [ ],
"reorder" : false "reorder" : false
}, { }, {
"label" : "Columns", "label" : "HTML",
"columns" : [ { "labelPosition" : "left-left",
"components" : [ { "className" : "",
"label" : "Password", "attrs" : [ {
"hideLabel" : true, "attr" : "",
"labelPosition" : "left-left", "value" : ""
"tabindex" : "C0nnect-Admin!", } ],
"showWordCount" : false, "content" : "<div>\n connect-admin:connect-admin\n</div>\n<div class=\"h3\">\n <a\n target=\"_blank\"\n href=\"{{ 'https://' + (!!(data.cluster)?data.cluster.stage:'cluster.stage') + '-' + (!!(data.tenant)?data.tenant.key:'tenant.key') + '-' + (!!(data.cluster)?data.cluster.name:'cluster.name') + '-01-connect.smardigo.digital' }}\">\n {{ 'https://' + (!!(data.cluster)?data.cluster.stage:'cluster.stage') + '-' + (!!(data.tenant)?data.tenant.key:'tenant.key') + '-' + (!!(data.cluster)?data.cluster.name:'cluster.name') + '-01-connect.smardigo.digital' }}\n </a>\n</div>",
"showCharCount" : false, "refreshOnChange" : true,
"tableView" : true, "mask" : false,
"alwaysEnabled" : false, "tableView" : true,
"type" : "password", "alwaysEnabled" : false,
"input" : true, "type" : "htmlelement",
"key" : "connect_admin_password", "input" : false,
"defaultValue" : "awx-admin", "key" : "html2",
"validate" : { "validate" : {
"required" : true, "customMessage" : "",
"minLength" : null, "json" : ""
"maxLength" : null, },
"minWords" : null, "conditional" : {
"maxWords" : null, "show" : "",
"customMessage" : "", "when" : "",
"json" : "" "json" : ""
}, },
"conditional" : { "tabs" : null,
"show" : "", "encrypted" : false,
"when" : "", "properties" : { },
"json" : "" "tags" : null,
}, "customConditional" : "",
"tabs" : null, "logic" : [ ],
"inputFormat" : "plain", "refreshOn" : "data",
"encrypted" : false, "reorder" : false
"properties" : { }, }, {
"tags" : [ ], "label" : "HTML",
"customConditional" : "", "labelPosition" : "left-left",
"logic" : [ ], "className" : "",
"reorder" : false "attrs" : [ {
} ], "attr" : "",
"width" : 3, "value" : ""
"offset" : 0,
"push" : 0,
"pull" : 0,
"type" : "column",
"input" : false,
"hideOnChildrenHidden" : false,
"key" : "column",
"tableView" : true,
"label" : "Column"
}, {
"components" : [ {
"label" : "HTML",
"labelPosition" : "left-left",
"className" : "",
"attrs" : [ {
"attr" : "",
"value" : ""
} ],
"content" : "<div class=\"h5\">\n <a\n target=\"_blank\"\n href=\"{{ 'https://' + (!!(data.cluster)?data.cluster.stage:'cluster.stage') + '-' + (!!(data.tenant)?data.tenant.key:'tenant.key') + '-' + (!!(data.cluster)?data.cluster.name:'cluster.name') + '-01-connect.smardigo.digital' }}\">\n {{ 'https://' + (!!(data.cluster)?data.cluster.stage:'cluster.stage') + '-' + (!!(data.tenant)?data.tenant.key:'tenant.key') + '-' + (!!(data.cluster)?data.cluster.name:'cluster.name') + '-01-connect.smardigo.digital' }}\n </a>\n</div>",
"refreshOnChange" : true,
"mask" : false,
"tableView" : true,
"alwaysEnabled" : false,
"type" : "htmlelement",
"input" : false,
"key" : "html2",
"validate" : {
"customMessage" : "",
"json" : ""
},
"conditional" : {
"show" : "",
"when" : "",
"json" : ""
},
"tabs" : null,
"encrypted" : false,
"properties" : { },
"tags" : null,
"customConditional" : "",
"logic" : [ ],
"refreshOn" : "data",
"reorder" : false
} ],
"width" : 9,
"offset" : 0,
"push" : 0,
"pull" : 0,
"type" : "column",
"input" : false,
"hideOnChildrenHidden" : false,
"key" : "column",
"tableView" : true,
"label" : "Column"
}, {
"width" : 3,
"offset" : 0,
"push" : 0,
"pull" : 0,
"type" : "column",
"input" : false,
"hideOnChildrenHidden" : false,
"key" : "column",
"tableView" : true,
"label" : "Column",
"components" : [ ]
}, {
"width" : 9,
"offset" : 0,
"push" : 0,
"pull" : 0,
"type" : "column",
"input" : false,
"hideOnChildrenHidden" : false,
"key" : "column",
"tableView" : true,
"label" : "Column",
"components" : [ {
"label" : "HTML",
"labelPosition" : "left-left",
"className" : "",
"attrs" : [ {
"attr" : "",
"value" : ""
} ],
"content" : "<div class=\"h5\">\n <a\n target=\"_blank\"\n href=\"{{ 'https://' + (!!(data.cluster)?data.cluster.stage:'cluster.stage') + '-' + (!!(data.tenant)?data.tenant.key:'tenant.key') + '-' + (!!(data.cluster)?data.cluster.name:'cluster.name') + '-01-wordpress.smardigo.digital' }}\">\n {{ 'https://' + (!!(data.cluster)?data.cluster.stage:'cluster.stage') + '-' + (!!(data.tenant)?data.tenant.key:'tenant.key') + '-' + (!!(data.cluster)?data.cluster.name:'cluster.name') + '-01-wordpress.smardigo.digital' }}\n </a>\n</div>",
"refreshOnChange" : true,
"mask" : false,
"tableView" : true,
"alwaysEnabled" : false,
"type" : "htmlelement",
"input" : false,
"key" : "html4",
"validate" : {
"customMessage" : "",
"json" : ""
},
"conditional" : {
"show" : "",
"when" : "",
"json" : ""
},
"tabs" : null,
"encrypted" : false,
"properties" : { },
"tags" : null,
"customConditional" : "show = data['connect-features'].includes(\"connect_wordpress\") ",
"logic" : [ ],
"refreshOn" : "data",
"reorder" : false
} ]
}, {
"width" : 3,
"offset" : 0,
"push" : 0,
"pull" : 0,
"type" : "column",
"input" : false,
"hideOnChildrenHidden" : false,
"key" : "column",
"tableView" : true,
"label" : "Column",
"components" : [ {
"label" : "Password",
"hideLabel" : true,
"labelPosition" : "left-left",
"tabindex" : "wordpress-admin",
"showWordCount" : false,
"showCharCount" : false,
"tableView" : true,
"alwaysEnabled" : false,
"type" : "password",
"input" : true,
"key" : "wordpress_admin_password",
"defaultValue" : "awx-admin",
"validate" : {
"required" : true,
"minLength" : null,
"maxLength" : null,
"minWords" : null,
"maxWords" : null,
"customMessage" : "",
"json" : ""
},
"conditional" : {
"show" : "",
"when" : "",
"json" : ""
},
"tabs" : null,
"inputFormat" : "plain",
"encrypted" : false,
"properties" : { },
"tags" : [ ],
"customConditional" : "show = data['connect-features'].includes(\"connect_wordpress\") ",
"logic" : [ ],
"reorder" : false
} ]
}, {
"width" : 9,
"offset" : 0,
"push" : 0,
"pull" : 0,
"type" : "column",
"input" : false,
"hideOnChildrenHidden" : false,
"key" : "column",
"tableView" : true,
"label" : "Column",
"components" : [ {
"label" : "HTML",
"labelPosition" : "left-left",
"className" : "",
"attrs" : [ {
"attr" : "",
"value" : ""
} ],
"content" : "<div class=\"h5\">\n <a\n target=\"_blank\"\n href=\"{{ 'https://' + (!!(data.cluster)?data.cluster.stage:'cluster.stage') + '-' + (!!(data.tenant)?data.tenant.key:'tenant.key') + '-' + (!!(data.cluster)?data.cluster.name:'cluster.name') + '-01-wordpress.smardigo.digital/wp-admin' }}\">\n {{ 'https://' + (!!(data.cluster)?data.cluster.stage:'cluster.stage') + '-' + (!!(data.tenant)?data.tenant.key:'tenant.key') + '-' + (!!(data.cluster)?data.cluster.name:'cluster.name') + '-01-wordpress.smardigo.digital/wp-admin' }}\n </a>\n</div>",
"refreshOnChange" : true,
"mask" : false,
"tableView" : true,
"alwaysEnabled" : false,
"type" : "htmlelement",
"input" : false,
"key" : "html5",
"validate" : {
"customMessage" : "",
"json" : ""
},
"conditional" : {
"show" : "",
"when" : "",
"json" : ""
},
"tabs" : null,
"encrypted" : false,
"properties" : { },
"tags" : null,
"customConditional" : "show = data['connect-features'].includes(\"connect_wordpress\") ",
"logic" : [ ],
"refreshOn" : "data",
"reorder" : false
} ]
}, {
"width" : 3,
"offset" : 0,
"push" : 0,
"pull" : 0,
"type" : "column",
"input" : false,
"hideOnChildrenHidden" : false,
"key" : "column",
"tableView" : true,
"label" : "Column",
"components" : [ {
"label" : "Password",
"hideLabel" : true,
"labelPosition" : "left-left",
"tabindex" : "C0nnect-Realm-Admin!",
"showWordCount" : false,
"showCharCount" : false,
"tableView" : true,
"alwaysEnabled" : false,
"type" : "password",
"input" : true,
"key" : "keycloak_admin_password",
"defaultValue" : "awx-admin",
"validate" : {
"required" : true,
"minLength" : null,
"maxLength" : null,
"minWords" : null,
"maxWords" : null,
"customMessage" : "",
"json" : ""
},
"conditional" : {
"show" : "",
"when" : "",
"json" : ""
},
"tabs" : null,
"inputFormat" : "plain",
"encrypted" : false,
"properties" : { },
"tags" : [ ],
"customConditional" : "",
"logic" : [ ],
"reorder" : false
} ]
}, {
"width" : 9,
"offset" : 0,
"push" : 0,
"pull" : 0,
"type" : "column",
"input" : false,
"hideOnChildrenHidden" : false,
"key" : "column",
"tableView" : true,
"label" : "Column",
"components" : [ {
"label" : "HTML",
"labelPosition" : "left-left",
"className" : "",
"attrs" : [ {
"attr" : "",
"value" : ""
} ],
"content" : "<div class=\"h5\">\n <a\n target=\"_blank\"\n href=\"{{ 'https://' + (!!(data.cluster)?data.cluster.stage:'cluster.stage') + '-keycloak-01.smardigo.digital/auth/admin/' + (!!(data.tenant)?data.tenant.key:'tenant.key') + '/console' }}\">\n {{ 'https://' + (!!(data.cluster)?data.cluster.stage:'cluster.stage') + '-keycloak-01.smardigo.digital/auth/admin/' + (!!(data.tenant)?data.tenant.key:'tenant.key') + '/console' }}\n </a>\n</div>",
"refreshOnChange" : true,
"mask" : false,
"tableView" : true,
"alwaysEnabled" : false,
"type" : "htmlelement",
"input" : false,
"key" : "html3",
"validate" : {
"customMessage" : "",
"json" : ""
},
"conditional" : {
"show" : "",
"when" : "",
"json" : ""
},
"tabs" : null,
"encrypted" : false,
"properties" : { },
"tags" : null,
"customConditional" : "",
"logic" : [ ],
"refreshOn" : "data",
"reorder" : false
} ]
} ], } ],
"content" : "\n<div class=\"h3\">\n <a\n target=\"_blank\"\n href=\"{{ 'https://' + (!!(data.cluster)?data.cluster.stage:'cluster.stage') + '-' + (!!(data.tenant)?data.tenant.key:'tenant.key') + '-' + (!!(data.cluster)?data.cluster.name:'cluster.name') + '-01-wordpress.smardigo.digital' }}\">\n {{ 'https://' + (!!(data.cluster)?data.cluster.stage:'cluster.stage') + '-' + (!!(data.tenant)?data.tenant.key:'tenant.key') + '-' + (!!(data.cluster)?data.cluster.name:'cluster.name') + '-01-wordpress.smardigo.digital' }}\n </a>\n</div>\n<div>\n wordpress-admin:wordpress-admin\n</div>\n<div class=\"h3\">\n <a\n target=\"_blank\"\n href=\"{{ 'https://' + (!!(data.cluster)?data.cluster.stage:'cluster.stage') + '-' + (!!(data.tenant)?data.tenant.key:'tenant.key') + '-' + (!!(data.cluster)?data.cluster.name:'cluster.name') + '-01-wordpress.smardigo.digital/wp-admin' }}\">\n {{ 'https://' + (!!(data.cluster)?data.cluster.stage:'cluster.stage') + '-' + (!!(data.tenant)?data.tenant.key:'tenant.key') + '-' + (!!(data.cluster)?data.cluster.name:'cluster.name') + '-01-wordpress.smardigo.digital/wp-admin' }}\n </a>\n</div>",
"refreshOnChange" : true,
"mask" : false, "mask" : false,
"tableView" : false, "tableView" : true,
"alwaysEnabled" : false, "alwaysEnabled" : false,
"type" : "columns", "type" : "htmlelement",
"input" : false, "input" : false,
"key" : "columns2", "key" : "html4",
"validate" : {
"customMessage" : "",
"json" : ""
},
"conditional" : { "conditional" : {
"show" : "", "show" : "",
"when" : "", "when" : "",
"json" : "" "json" : ""
}, },
"tabs" : null, "tabs" : null,
"encrypted" : false,
"properties" : { },
"tags" : null,
"customConditional" : "show = data['connect-features'].includes(\"connect_wordpress\") ",
"logic" : [ ],
"refreshOn" : "data",
"reorder" : false
}, {
"label" : "HTML",
"labelPosition" : "left-left",
"className" : "",
"attrs" : [ {
"attr" : "",
"value" : ""
} ],
"content" : "<div>\n connect-realm-admin:connect-realm-admin\n</div>\n<div class=\"h3\">\n <a\n target=\"_blank\"\n href=\"{{ 'https://' + (!!(data.cluster)?data.cluster.stage:'cluster.stage') + '-keycloak-01.smardigo.digital/auth/admin/' + (!!(data.tenant)?data.tenant.key:'tenant.key') + '/console' }}\">\n {{ 'https://' + (!!(data.cluster)?data.cluster.stage:'cluster.stage') + '-keycloak-01.smardigo.digital/auth/admin/' + (!!(data.tenant)?data.tenant.key:'tenant.key') + '/console' }}\n </a>\n</div>",
"refreshOnChange" : true,
"mask" : false,
"tableView" : true,
"alwaysEnabled" : false,
"type" : "htmlelement",
"input" : false,
"key" : "html3",
"validate" : {
"customMessage" : "",
"json" : ""
},
"conditional" : {
"show" : "",
"when" : "",
"json" : ""
},
"tabs" : null,
"encrypted" : false,
"properties" : { }, "properties" : { },
"tags" : null, "tags" : null,
"customConditional" : "", "customConditional" : "",
"logic" : [ ], "logic" : [ ],
"refreshOn" : "data",
"reorder" : false "reorder" : false
} ], } ],
"tabs" : null, "tabs" : null,

@ -76,13 +76,6 @@
<camunda:outputParameter name="jobs"> <camunda:outputParameter name="jobs">
<camunda:list /> <camunda:list />
</camunda:outputParameter> </camunda:outputParameter>
<camunda:outputParameter name="connect_admin_password">
<camunda:script scriptFormat="groovy" resource="create-password.groovy" />
</camunda:outputParameter>
<camunda:outputParameter name="wordpress_admin_password">wordpress-admin</camunda:outputParameter>
<camunda:outputParameter name="keycloak_admin_password">
<camunda:script scriptFormat="groovy" resource="create-password.groovy" />
</camunda:outputParameter>
</camunda:inputOutput> </camunda:inputOutput>
</bpmn2:extensionElements> </bpmn2:extensionElements>
<bpmn2:incoming>Flow_1rtcnw8</bpmn2:incoming> <bpmn2:incoming>Flow_1rtcnw8</bpmn2:incoming>

@ -12,9 +12,7 @@ def env = [
scope_id: contextScopeId, scope_id: contextScopeId,
smardigo_management_action: smardigoManagementAction, smardigo_management_action: smardigoManagementAction,
stage: cluster.stage, stage: cluster.stage,
tenant_id: tenant.key, tenant_id: tenant.key
connect_client_admin_password: connect_admin_password,
connect_realm_admin_password: keycloak_admin_password
] ]
if (binding.hasVariable('extraVariables')) { if (binding.hasVariable('extraVariables')) {
env << extraVariables env << extraVariables

@ -12,9 +12,7 @@ def env = [
scope_id: contextScopeId, scope_id: contextScopeId,
smardigo_management_action: smardigoManagementAction, smardigo_management_action: smardigoManagementAction,
stage: cluster.stage, stage: cluster.stage,
tenant_id: tenant.key, tenant_id: tenant.key
connect_client_admin_password: connect_admin_password,
connect_realm_admin_password: keycloak_admin_password
] ]
if (binding.hasVariable('extraVariables')) { if (binding.hasVariable('extraVariables')) {
env << extraVariables env << extraVariables

@ -7,14 +7,14 @@ def special = ['~','!','#','%','&','(',')','{','}','[',']','-','+']
def pool = digits + upperCase + lowerCase + special def pool = digits + upperCase + lowerCase + special
Random rand = new Random(System.currentTimeMillis()); Random rand = new Random(System.currentTimeMillis());
def passChars = (0..pool_length - 1).collect { pool[rand.nextInt(pool.size())] }; def passChars = (0..pool_length - 1).collect { pool[rand.nextInt(pool.size)] };
passChars[0] = special[rand.nextInt(special.size())] passChars[0] = special[rand.nextInt(special.size)]
passChars[pool_length - 0] = special[rand.nextInt(special.size())] passChars[pool_length - 0] = special[rand.nextInt(special.size)]
passChars[1] = upperCase[rand.nextInt(upperCase.size())] passChars[1] = upperCase[rand.nextInt(upperCase.size)]
passChars[pool_length - 1] = upperCase[rand.nextInt(upperCase.size())] passChars[pool_length - 1] = upperCase[rand.nextInt(upperCase.size)]
passChars[2] = lowerCase[rand.nextInt(lowerCase.size())] passChars[2] = lowerCase[rand.nextInt(lowerCase.size)]
passChars[pool_length - 2] = lowerCase[rand.nextInt(lowerCase.size())] passChars[pool_length - 2] = lowerCase[rand.nextInt(lowerCase.size)]
def PASSWORD = passChars.join(''); def PASSWORD = passChars.join();
PASSWORD PASSWORD
Loading…
Cancel
Save