diff --git a/salt/elasticsearch/enabled.sls b/salt/elasticsearch/enabled.sls index 48f094d3c..5a611ac94 100644 --- a/salt/elasticsearch/enabled.sls +++ b/salt/elasticsearch/enabled.sls @@ -71,7 +71,6 @@ so-elasticsearch: - /etc/pki/tls/certs/intca.crt:/usr/share/elasticsearch/config/ca.crt:ro - /etc/pki/elasticsearch.crt:/usr/share/elasticsearch/config/elasticsearch.crt:ro - /etc/pki/elasticsearch.key:/usr/share/elasticsearch/config/elasticsearch.key:ro - - /etc/pki/elasticsearch.p12:/usr/share/elasticsearch/config/elasticsearch.p12:ro - /opt/so/conf/elasticsearch/users_roles:/usr/share/elasticsearch/config/users_roles:ro - /opt/so/conf/elasticsearch/users:/usr/share/elasticsearch/config/users:ro {% if ELASTICSEARCHMERGED.config.path.get('repo', False) %} @@ -99,7 +98,6 @@ so-elasticsearch: - file: eslog4jfile - file: nsmesdir - file: eslogdir - - file: elasticp12perms - cmd: auth_users_roles_inode - cmd: auth_users_inode diff --git a/salt/elasticsearch/ssl.sls b/salt/elasticsearch/ssl.sls index a2d327830..7d54dfd56 100644 --- a/salt/elasticsearch/ssl.sls +++ b/salt/elasticsearch/ssl.sls @@ -38,10 +38,6 @@ elasticsearch_crt: - retry: attempts: 5 interval: 30 - cmd.run: - - name: "/usr/bin/openssl pkcs12 -inkey /etc/pki/elasticsearch.key -in /etc/pki/elasticsearch.crt -export -out /etc/pki/elasticsearch.p12 -nodes -passout pass:" - - onchanges: - - x509: /etc/pki/elasticsearch.key elastickeyperms: file.managed: @@ -50,13 +46,6 @@ elastickeyperms: - mode: 640 - group: 930 -elasticp12perms: - file.managed: - - replace: False - - name: /etc/pki/elasticsearch.p12 - - mode: 640 - - group: 930 - {% else %} {{sls}}_state_not_allowed: