diff --git a/files/src/main/java/de/nbscloud/files/config/FilesConfig.java b/files/src/main/java/de/nbscloud/files/config/FilesConfig.java index d59806e..216032c 100644 --- a/files/src/main/java/de/nbscloud/files/config/FilesConfig.java +++ b/files/src/main/java/de/nbscloud/files/config/FilesConfig.java @@ -7,6 +7,7 @@ import org.springframework.context.annotation.PropertySource; @Configuration @ConfigurationProperties(prefix = "nbs-cloud.files") @PropertySource("classpath:/config/files-application.properties") +@PropertySource(value = "classpath:/config/files-application-${spring.profiles.active}.properties", ignoreResourceNotFound = true) public class FilesConfig { private String baseDir; private boolean filterHidden; diff --git a/files/src/main/resources/config/files-application-mk.properties b/files/src/main/resources/config/files-application-mk.properties new file mode 100644 index 0000000..63f6ad5 --- /dev/null +++ b/files/src/main/resources/config/files-application-mk.properties @@ -0,0 +1 @@ +nbs-cloud.files.baseDir=/opt/nextcloud_data/marius/files \ No newline at end of file diff --git a/files/src/main/resources/config/files-application.properties b/files/src/main/resources/config/files-application.properties index 48e75a5..91e5e8b 100644 --- a/files/src/main/resources/config/files-application.properties +++ b/files/src/main/resources/config/files-application.properties @@ -5,7 +5,7 @@ info.app.description=A simple web file admin app # Knob to configure the base dir where files stores and reads files # Make sure the permissions match -nbs-cloud.files.baseDir=/opt/nextcloud_data/marius/files +nbs-cloud.files.baseDir=/home/marius/nbstest # Knob to configure whether hidden files (e.g. starting with '.' on *NIX) # will be filtered in the file view diff --git a/pom.xml b/pom.xml index 0374c61..5e1f4cf 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,7 @@ UTF-8 18 + @@ -194,4 +195,13 @@ + + + release + + ${deploymentProfile} + + + + diff --git a/tools/deploy.sh b/tools/deploy.sh index d1154e2..f36e3d7 100644 --- a/tools/deploy.sh +++ b/tools/deploy.sh @@ -3,13 +3,16 @@ workspace_loc=$1 echo "$workspace_loc" +profile=$2 +echo "$profile" + pwd deploy_tmp="deploy_tmp" target_loc="/opt/nbscloud" -app_props_loc="$workspace_loc/web-container/target/classes/config/application.properties" -files_prop_loc="$workspace_loc/files/target/classes/config/files-application.properties" +app_props_loc="$workspace_loc/web-container/target/classes/config/application-$profile.properties" +files_prop_loc="$workspace_loc/files/target/classes/config/files-application-$profile.properties" echo "$app_props_loc" echo "$files_prop_loc" diff --git a/web-container/src/main/resources/config/application-mk.properties b/web-container/src/main/resources/config/application-mk.properties new file mode 100644 index 0000000..4c997bf --- /dev/null +++ b/web-container/src/main/resources/config/application-mk.properties @@ -0,0 +1,2 @@ +nbscloud.deploy.service.user=marius +nbscloud.deploy.path=/opt/nbscloud \ No newline at end of file diff --git a/web-container/src/main/resources/config/application.properties b/web-container/src/main/resources/config/application.properties index 97ee7e9..927853c 100644 --- a/web-container/src/main/resources/config/application.properties +++ b/web-container/src/main/resources/config/application.properties @@ -19,7 +19,4 @@ logging.level.de.nbscloud=DEBUG # (e.g. systemd -> journald) server.servlet.context-path=/nbscloud -server.port=9966 - -nbscloud.deploy.service.user=marius -nbscloud.deploy.path=/opt/nbscloud \ No newline at end of file +server.port=9966 \ No newline at end of file