Skip to content

Commit 9737bcb

Browse files
authored
Merge pull request wildfly#6633 from jfdenise/WFCORE-7485
Fix for WFCORE-7485, Remove tmp directory created by Galleon at provisioning time
2 parents dc1e2c9 + 8591dc0 commit 9737bcb

8 files changed

Lines changed: 29 additions & 6 deletions

File tree

core-feature-pack/galleon-common/src/main/resources/configs/domain/model.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<package name="cleanup.domain.servers.dir" optional="true"/>
2626
<package name="cleanup.domain.log.dir" optional="true"/>
2727
<package name="cleanup.domain.data.dir" optional="true"/>
28+
<package name="cleanup.domain.tmp.dir" optional="true"/>
2829
<!-- Unstable API Annotation Index -->
2930
<package name="org.wildfly._internal.unstable-api-annotation-index" optional="true" valid-for-stability="preview" />
3031
<package name="org.wildfly.unstable.annotation.api.indexer" optional="true" valid-for-stability="preview" />

core-feature-pack/galleon-common/src/main/resources/configs/standalone/model.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<package name="cleanup.standalone.config.history.dir" optional="true"/>
2424
<package name="cleanup.standalone.log.dir" optional="true"/>
2525
<package name="cleanup.standalone.data.dir" optional="true"/>
26-
<package name="cleanup.standalone.tmp.vfs" optional="true"/>
26+
<package name="cleanup.standalone.tmp" optional="true"/>
2727

2828
<package name="org.wildfly.bootable-jar" optional="true"/>
2929
<package name="org.wildfly.embedded"/>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" ?>
2+
3+
<!--
4+
~ Copyright The WildFly Authors
5+
~ SPDX-License-Identifier: Apache-2.0
6+
-->
7+
8+
<package-spec xmlns="urn:jboss:galleon:package:2.0" name="cleanup.domain.tmp.dir"/>

core-feature-pack/galleon-common/src/main/resources/packages/core.misc.domain/pm/wildfly/tasks.xml renamed to core-feature-pack/galleon-common/src/main/resources/packages/cleanup.domain.tmp.dir/pm/wildfly/tasks.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
-->
77

88
<tasks xmlns="urn:wildfly:wildfly-feature-pack-tasks:2.0">
9-
<mkdir name="domain/tmp/auth"/>
9+
<delete path="domain/tmp" recursive="true"/>
1010
</tasks>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" ?>
2+
3+
<!--
4+
~ Copyright The WildFly Authors
5+
~ SPDX-License-Identifier: Apache-2.0
6+
-->
7+
8+
<package-spec xmlns="urn:jboss:galleon:package:2.0" name="cleanup.standalone.tmp"/>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" ?>
2+
3+
<!--
4+
~ Copyright The WildFly Authors
5+
~ SPDX-License-Identifier: Apache-2.0
6+
-->
7+
8+
<tasks xmlns="urn:wildfly:wildfly-feature-pack-tasks:2.0">
9+
<delete path="standalone/tmp" recursive="true"/>
10+
</tasks>

core-feature-pack/galleon-common/src/main/resources/packages/core.misc.common/pm/wildfly/tasks.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
<permission value="755">
1313
<filter pattern="*.sh" include="true"/>
1414
</permission>
15-
<permission value="700">
16-
<filter pattern="*/tmp/auth" include="true"/>
17-
</permission>
1815
<permission value="664">
1916
<filter pattern="*.properties" include="true"/>
2017
</permission>

core-feature-pack/galleon-common/src/main/resources/packages/core.misc.standalone/pm/wildfly/tasks.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@
77

88
<tasks xmlns="urn:wildfly:wildfly-feature-pack-tasks:2.0">
99
<mkdir name="standalone/lib/ext"/>
10-
<mkdir name="standalone/tmp/auth"/>
1110
</tasks>

0 commit comments

Comments
 (0)