Skip to content

[CYB-136] Fix issue with parcel installation on the Cluster #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carolynduby merged 1 commit into from
May 31, 2023
Merged

[CYB-136] Fix issue with parcel installation on the Cluster #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions flink-cyber/cyber-csd/src/main/scripts/control.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export CYBERSEC_BIN=${CYBERSEC_BIN:-$CDH_CYBERSEC_BIN}
export SCRIPTS_DIR=${SCRIPTS_DIR:-${CONF_DIR}/scripts}
export CYBERSEC_CONF_DIR=${CONF_DIR}/cybersec-conf

. $COMMON_SCRIPT

case $CMD in
(start-parser-ui)
Expand Down
16 changes: 0 additions & 16 deletions flink-cyber/cyber-parcel/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,22 +103,6 @@ under the License.
<attach>false</attach>
</configuration>
</execution>
<execution>
<id>Build meta.tar.gz</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptors>
<descriptor>src/main/assemblies/meta-assembly.xml</descriptor>
</descriptors>
<finalName>${parcel.filename}.meta</finalName>
<attach>false</attach>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand Down
42 changes: 0 additions & 42 deletions flink-cyber/cyber-parcel/src/main/assemblies/meta-assembly.xml
View file
Open in desktop

This file was deleted.

21 changes: 21 additions & 0 deletions flink-cyber/cyber-parcel/src/main/assemblies/parcel-assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,15 @@
<directory>${basedir}/src/main/meta</directory>
<outputDirectory>/meta</outputDirectory>
<filtered>true</filtered>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>

<fileSet>
<directory>${basedir}/target/cyber-jobs-${project.parent.version}/lib</directory>
<outputDirectory>/lib</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
<includes>
<include>*</include>
</includes>
Expand All @@ -50,6 +54,8 @@
<fileSet>
<directory>${basedir}/target/cyber-jobs-${project.parent.version}/jobs</directory>
<outputDirectory>/jobs</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
<includes>
<include>*</include>
</includes>
Expand All @@ -58,6 +64,7 @@
<fileSet>
<directory>${basedir}/target/cyber-jobs-${project.parent.version}/conf</directory>
<outputDirectory>/etc/conf</outputDirectory>
<directoryMode>0755</directoryMode>
<includes>
<include>*</include>
</includes>
Expand All @@ -66,6 +73,8 @@
<fileSet>
<directory>${basedir}/target/cyber-jobs-${project.parent.version}/conf/templates</directory>
<outputDirectory>/etc/conf/templates</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
<includes>
<include>*</include>
</includes>
Expand All @@ -74,6 +83,8 @@
<fileSet>
<directory>${basedir}/target/cyber-jobs-${project.parent.version}/conf/templates/index</directory>
<outputDirectory>/etc/conf/templates/index</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
<includes>
<include>*</include>
</includes>
Expand All @@ -82,6 +93,8 @@
<fileSet>
<directory>${basedir}/target/cyber-jobs-${project.parent.version}/conf/templates/parse</directory>
<outputDirectory>/etc/conf/templates/parse</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
<includes>
<include>*</include>
</includes>
Expand All @@ -90,6 +103,8 @@
<fileSet>
<directory>${basedir}/target/cyber-jobs-${project.parent.version}/conf/templates/profile</directory>
<outputDirectory>/etc/conf/templates/profile</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
<includes>
<include>*</include>
</includes>
Expand All @@ -98,6 +113,8 @@
<fileSet>
<directory>${basedir}/target/cyber-jobs-${project.parent.version}/conf/templates/triage</directory>
<outputDirectory>/etc/conf/templates/triage</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
<includes>
<include>*</include>
</includes>
Expand All @@ -106,6 +123,8 @@
<fileSet>
<directory>${basedir}/target/cyber-jobs-${project.parent.version}/bin</directory>
<outputDirectory>/bin</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
<includes>
<include>*</include>
</includes>
Expand All @@ -114,6 +133,8 @@
<fileSet>
<directory>${basedir}/target/cyber-jobs-${project.parent.version}/tools</directory>
<outputDirectory>/tools</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
<includes>
<include>*</include>
</includes>
Expand Down
2 changes: 1 addition & 1 deletion flink-cyber/cyber-parcel/src/main/meta/permissions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"bin": {
"bin/env.sh": {
"user": "cybersec",
"group": "cybersec",
"permissions": "0755"
Expand Down