#18 Add profiles

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;

files/src/main/resources/config/files-application-mk.properties

@@ -0,0 +1 @@
+nbs-cloud.files.baseDir=/opt/nextcloud_data/marius/files

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

pom.xml

@@ -32,6 +32,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>18</java.version>
         <scmDeveloperConnectionProp />
+        <deploymentProfile></deploymentProfile>
     </properties>
 
     <distributionManagement>
@@ -194,4 +195,13 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>release</id>
+            <properties>
+                <activeProfiles>${deploymentProfile}</activeProfiles>
+            </properties>
+        </profile>
+    </profiles>
+
 </project>

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"

web-container/src/main/resources/config/application-mk.properties

@@ -0,0 +1,2 @@
+nbscloud.deploy.service.user=marius
+nbscloud.deploy.path=/opt/nbscloud

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
+server.port=9966