-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #27 from Ontotext-AD/GDB-6295-Update-users-provisi…
…oning-to-work-with-the-new-users-file GDB-6295 update users provisioning to work with the new users file
- Loading branch information
Showing
14 changed files
with
332 additions
and
119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <restrict> | ||
| <!--Do not allow exec and write operations outside of allowed ones--> | ||
| <commands> | ||
| <command>read</command> | ||
| <command>list</command> | ||
| <command>version</command> | ||
| <command>search</command> | ||
| </commands> | ||
| <allow> | ||
| <mbean> | ||
| <name>java.lang:type=Memory</name> | ||
| <attribute mode="read">*</attribute> | ||
| <operation>gc</operation> | ||
| </mbean> | ||
| <mbean> | ||
| <name>ReplicationCluster:*</name> | ||
| <attribute>*</attribute> | ||
| <operation>*</operation> | ||
| </mbean> | ||
| <mbean> | ||
| <name>Tomcat:*</name> | ||
| <attribute>*</attribute> | ||
| <operation>*</operation> | ||
| </mbean> | ||
| <mbean> | ||
| <name>ch.qos.logback.classic:*</name> | ||
| <attribute>*</attribute> | ||
| <operation>*</operation> | ||
| </mbean> | ||
| <mbean> | ||
| <name>com.ontotext:*</name> | ||
| <attribute>*</attribute> | ||
| <operation>*</operation> | ||
| </mbean> | ||
| <mbean> | ||
| <name>java.util.logging:type=Logging</name> | ||
| <attribute>*</attribute> | ||
| <operation>*</operation> | ||
| </mbean> | ||
| </allow> | ||
|
|
||
| <deny> | ||
| <mbean> | ||
| <name>jolokia:*</name> | ||
| <operation>*</operation> | ||
| <attribute>*</attribute> | ||
| </mbean> | ||
| </deny> | ||
| </restrict> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| { | ||
| "users" : { | ||
| "admin" : { | ||
| "username" : "admin", | ||
| "password" : "{bcrypt}$2a$10$H7uekkF1ZFLIV5M1g9tDs.syZGtkMqrfj2Si2SHG1WgwhpNqpZwne", | ||
| "grantedAuthorities" : [ "ROLE_ADMIN" ], | ||
| "appSettings" : { | ||
| "DEFAULT_INFERENCE" : true, | ||
| "DEFAULT_VIS_GRAPH_SCHEMA" : true, | ||
| "DEFAULT_SAMEAS" : true, | ||
| "IGNORE_SHARED_QUERIES" : false, | ||
| "EXECUTE_COUNT" : true | ||
| }, | ||
| "dateCreated" : 1618403171751 | ||
| }, | ||
| "provisioner" : { | ||
| "username" : "{{ .Values.graphdb.security.provisioningUsername }}", | ||
| "password" : "{bcrypt}{{ htpasswd .Values.graphdb.security.provisioningUsername .Values.graphdb.security.provisioningPassword | trimPrefix (printf "%s:" .Values.graphdb.security.provisioningUsername) }}", | ||
| "grantedAuthorities" : [ "ROLE_ADMIN" ], | ||
| "appSettings" : { | ||
| "DEFAULT_INFERENCE" : true, | ||
| "DEFAULT_VIS_GRAPH_SCHEMA" : true, | ||
| "DEFAULT_SAMEAS" : true, | ||
| "IGNORE_SHARED_QUERIES" : false, | ||
| "EXECUTE_COUNT" : true | ||
| }, | ||
| "dateCreated" : 1618403171751 | ||
| } | ||
| }, | ||
| "user_queries" : { | ||
| "admin" : { | ||
| "SPARQL Select template" : { | ||
| "name" : "SPARQL Select template", | ||
| "body" : "SELECT ?s ?p ?o\nWHERE {\n\t?s ?p ?o .\n} LIMIT 100", | ||
| "shared" : false | ||
| }, | ||
| "Clear graph" : { | ||
| "name" : "Clear graph", | ||
| "body" : "CLEAR GRAPH <http://example>", | ||
| "shared" : false | ||
| }, | ||
| "Add statements" : { | ||
| "name" : "Add statements", | ||
| "body" : "PREFIX dc: <http://purl.org/dc/elements/1.1/>\nINSERT DATA\n {\n GRAPH <http://example> {\n <http://example/book1> dc:title \"A new book\" ;\n dc:creator \"A.N.Other\" .\n }\n }", | ||
| "shared" : false | ||
| }, | ||
| "Remove statements" : { | ||
| "name" : "Remove statements", | ||
| "body" : "PREFIX dc: <http://purl.org/dc/elements/1.1/>\nDELETE DATA\n{\nGRAPH <http://example> {\n <http://example/book1> dc:title \"A new book\" ;\n dc:creator \"A.N.Other\" .\n }\n}", | ||
| "shared" : false | ||
| } | ||
| } | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
templates/configuration/graphdb-jolokia-access-configmap.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| # Default configuration map for provisioning the GraphDB jolokia access settings. | ||
| # To change it, prepare another configuration map and update "graphdb.configs.jolokiaAccessConfigMap" | ||
| {{- $configs := (.Values.graphdb.configs | default dict) }} | ||
| {{- if $configs.jolokiaAccessConfigMap }} | ||
| {{- if eq $configs.jolokiaAccessConfigMap "graphdb-jolokia-access-configmap" }} | ||
| apiVersion: {{ .Values.versions.configmap }} | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: graphdb-jolokia-access-configmap | ||
| labels: | ||
| name: graphdb-jolokia-access-configmap | ||
| data: | ||
| jolokia-access.xml: |- | ||
| {{ tpl (.Files.Get "files/config/jolokia-access.xml" | indent 4) . }} | ||
| {{- end }} | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| # Default configuration map for provisioning GraphDB properties. | ||
| # To change it, prepare another configuration map and update "graphdb.configs.propertiesConfigMap" | ||
| {{- $configs := (.Values.graphdb.configs | default dict) }} | ||
| {{- if $configs.propertiesConfigMap}} | ||
| {{- if eq $configs.propertiesConfigMap "graphdb-properties-configmap" }} | ||
| apiVersion: {{ .Values.versions.configmap }} | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: graphdb-properties-configmap | ||
| labels: | ||
| name: graphdb-properties-configmap | ||
| data: | ||
| graphdb.properties: |- | ||
| {{ tpl (.Files.Get "files/config/graphdb.properties" | indent 4) . }} | ||
| {{- end }} | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # Default configuration map for provisioning GraphDB settings.js file. | ||
| # To change it, prepare another configuration map and update "graphdb.configs.settingsConfigMap" | ||
| {{- $configs := (.Values.graphdb.configs | default dict) }} | ||
| {{- $settingsConfigMap := $configs.settingsConfigMap | default "" }} | ||
| {{- if or (eq $settingsConfigMap "graphdb-settings-configmap") (and (not $settingsConfigMap ) (.Values.graphdb.security.enabled)) }} | ||
| apiVersion: {{ .Values.versions.configmap }} | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: graphdb-settings-configmap | ||
| labels: | ||
| name: graphdb-settings-configmap | ||
| data: | ||
| settings.js: |- | ||
| {{ tpl (.Files.Get "files/config/settings.js" | indent 4) . }} | ||
| {{- end }} |
17 changes: 0 additions & 17 deletions
17
templates/configuration/graphdb-settings-default-configmap.yaml
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # Default configuration map for provisioning GraphDB users.js file. | ||
| # To change it, prepare another configuration map and update "graphdb.configs.usersConfigMap" | ||
| {{- $configs := (.Values.graphdb.configs | default dict) }} | ||
| {{- $usersConfigMap := $configs.usersConfigMap | default ""}} | ||
| {{- if or (eq $usersConfigMap "graphdb-users-configmap") (and (not $usersConfigMap) (.Values.graphdb.security.enabled)) }} | ||
| apiVersion: {{ .Values.versions.configmap }} | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: graphdb-users-configmap | ||
| labels: | ||
| name: graphdb-users-configmap | ||
| data: | ||
| users.js: |- | ||
| {{ tpl (.Files.Get "files/config/users.js" | indent 4) . }} | ||
| {{- end }} |
Oops, something went wrong.