rename to settins.yml

src/main/java/stirling/software/SPDF/config/ConfigInitializer.java

@@ -22,7 +22,7 @@ public class ConfigInitializer implements ApplicationContextInitializer<Configur
 
 	public void ensureConfigExists() throws IOException {
 		// Define the path to the external config directory
-		Path destPath = Paths.get("configs", "application.yml");
+		Path destPath = Paths.get("configs", "settings.yml");
 
 		// Check if the file already exists
 		if (Files.notExists(destPath)) {
@@ -30,11 +30,11 @@ public class ConfigInitializer implements ApplicationContextInitializer<Configur
 			Files.createDirectories(destPath.getParent());
 
 			// Copy the resource from classpath to the external directory
-			try (InputStream in = getClass().getClassLoader().getResourceAsStream("application.yml.template")) {
+			try (InputStream in = getClass().getClassLoader().getResourceAsStream("settings.yml.template")) {
 				if (in != null) {
 					Files.copy(in, destPath);
 				} else {
-					throw new FileNotFoundException("Resource file not found: application.yml.template");
+					throw new FileNotFoundException("Resource file not found: settings.yml.template");
 				}
 			}
 		}

src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java

@@ -1,20 +1,28 @@
 package stirling.software.SPDF.config;
 
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import stirling.software.SPDF.model.ApplicationProperties;
 @Service
 public class EndpointConfiguration {
     private static final Logger logger = LoggerFactory.getLogger(EndpointConfiguration.class);
     private Map<String, Boolean> endpointStatuses = new ConcurrentHashMap<>();
     private Map<String, Set<String>> endpointGroups = new ConcurrentHashMap<>();
 
-    public EndpointConfiguration() {
+    private final ApplicationProperties applicationProperties;
+
+    @Autowired
+    public EndpointConfiguration(ApplicationProperties applicationProperties) {
+        this.applicationProperties = applicationProperties;
         init();
         processEnvironmentConfigs();
     }
@@ -198,21 +206,19 @@ public class EndpointConfiguration {
         
         
     }
-                
+    
     private void processEnvironmentConfigs() {
-        String endpointsToRemove = System.getenv("ENDPOINTS_TO_REMOVE");
-        String groupsToRemove = System.getenv("GROUPS_TO_REMOVE");
+        List<String> endpointsToRemove = applicationProperties.getEndpoints().getToRemove();
+        List<String> groupsToRemove = applicationProperties.getEndpoints().getGroupsToRemove();
 
         if (endpointsToRemove != null) {
-            String[] endpoints = endpointsToRemove.split(",");
-            for (String endpoint : endpoints) {
+            for (String endpoint : endpointsToRemove) {
                 disableEndpoint(endpoint.trim());
             }
         }
 
         if (groupsToRemove != null) {
-            String[] groups = groupsToRemove.split(",");
-            for (String group : groups) {
+            for (String group : groupsToRemove) {
                 disableGroup(group.trim());
             }
         }

src/main/java/stirling/software/SPDF/config/security/InitialSetup.java

@@ -24,11 +24,14 @@ public class InitialSetup {
 	@Autowired
 	private UserService userService;
 
+	@Autowired
+	ApplicationProperties applicationProperties;
+	
 	@PostConstruct
 	public void init() {
 		if (!userService.hasUsers()) {
-			String initialUsername = System.getenv("INITIAL_USERNAME");
-			String initialPassword = System.getenv("INITIAL_PASSWORD");
+			String initialUsername = applicationProperties.getSecurity().getInitialLogin().getUsername();
+			String initialPassword = applicationProperties.getSecurity().getInitialLogin().getPassword();
 			if (initialUsername != null && initialPassword != null) {
 				userService.saveUser(initialUsername, initialPassword, Role.ADMIN.getRoleId());
 			}
@@ -36,8 +39,7 @@ public class InitialSetup {
 		}
 	}
 
-	@Autowired
-	ApplicationProperties applicationProperties;
+
 
 	@PostConstruct
 	public void initSecretKey() throws IOException {
@@ -49,7 +51,7 @@ public class InitialSetup {
 	}
 
 	private void saveKeyToConfig(String key) throws IOException {
-		Path path = Paths.get("configs", "application.yml"); // Target the configs/application.yml
+		Path path = Paths.get("configs", "settings.yml"); // Target the configs/settings.yml
 		List<String> lines = Files.readAllLines(path);
 		boolean keyFound = false;