diff options
Diffstat (limited to 'packages/base')
4 files changed, 34 insertions, 4 deletions
diff --git a/packages/base/src/assembly/zip.xml b/packages/base/src/assembly/zip.xml index 28ab2d7d7..b14273b5c 100644 --- a/packages/base/src/assembly/zip.xml +++ b/packages/base/src/assembly/zip.xml @@ -43,7 +43,7 @@ <outputDirectory>install/3rdparty/</outputDirectory> <fileMode>700</fileMode> <directoryMode>700</directoryMode> - </fileSet> + </fileSet> <fileSet> <directory>${project.build.directory}/pdp/webapps</directory> <outputDirectory>install/servers/pdp/webapps</outputDirectory> diff --git a/packages/base/src/files/etc/cron.d/logrotate.cron b/packages/base/src/files/etc/cron.d/logrotate.cron index 32301443b..aa78eed24 100644 --- a/packages/base/src/files/etc/cron.d/logrotate.cron +++ b/packages/base/src/files/etc/cron.d/logrotate.cron @@ -1 +1 @@ -5 1 * * * /usr/sbin/logrotate -s ${{POLICY_HOME}}/var/logrotate.status ${{POLICY_HOME}}/etc/logrotate.d/elk.conf ${{POLICY_HOME}}/etc/logrotate.d/monitor.conf +5 1 * * * /usr/sbin/logrotate -s ${{POLICY_HOME}}/var/logrotate.status ${{POLICY_HOME}}/etc/logrotate.d/monitor.conf diff --git a/packages/base/src/files/install/servers/pap/bin/Decision_GuardPolicyTemplate.xml b/packages/base/src/files/install/servers/pap/bin/Decision_GuardPolicyTemplate.xml index 3a7f25008..6701a0848 100644 --- a/packages/base/src/files/install/servers/pap/bin/Decision_GuardPolicyTemplate.xml +++ b/packages/base/src/files/install/servers/pap/bin/Decision_GuardPolicyTemplate.xml @@ -14,11 +14,11 @@ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">${ECOMPName}</AttributeValue> <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/> </Match> - <Match MatchId="org.openecomp.function.regex-match"> + <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case"> <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">${actor}</AttributeValue> <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="actor" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/> </Match> - <Match MatchId="org.openecomp.function.regex-match"> + <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case"> <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">${recipe}</AttributeValue> <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="recipe" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/> </Match> diff --git a/packages/base/src/files/install/servers/pap/bin/policyelk.properties b/packages/base/src/files/install/servers/pap/bin/policyelk.properties new file mode 100644 index 000000000..88fa7d7d0 --- /dev/null +++ b/packages/base/src/files/install/servers/pap/bin/policyelk.properties @@ -0,0 +1,30 @@ +### +# ============LICENSE_START======================================================= +# ECOMP Policy Engine +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= +### + + +#Elk database url +policy.elk.url=http://localhost:9200 + + +#Policy Database properties +policy.database.driver=${{JDBC_DRIVER}} +policy.database.url=${{JDBC_URL}} +policy.database.username=${{JDBC_USER}} +policy.database.password=${{JDBC_PASSWORD}}
\ No newline at end of file |