Make anope database name configurable

FAForever · May 17, 2018 · 9ef97c4 · 9ef97c4
1 parent 7190242
commit 9ef97c4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -110,7 +110,7 @@ apply plugin: 'propdeps'
 apply plugin: 'idea'
 
 group = 'faforever'
-version = '1.3.1'
+version = '1.3.2'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

diff --git a/src/main/java/com/faforever/api/config/FafApiProperties.java b/src/main/java/com/faforever/api/config/FafApiProperties.java
@@ -36,6 +36,7 @@ public class FafApiProperties {
   private User user = new User();
   private Database database = new Database();
   private Mautic mautic = new Mautic();
+  private Anope anope = new Anope();
 
   @Data
   public static class OAuth2 {
@@ -222,4 +223,9 @@ public static class Mautic {
     private String clientSecret;
     private String accessTokenUrl;
   }
+
+  @Data
+  public class Anope {
+    private String databaseName;
+  }
 }
diff --git a/src/main/java/com/faforever/api/user/AnopeUserRepository.java b/src/main/java/com/faforever/api/user/AnopeUserRepository.java
@@ -1,5 +1,6 @@
 package com.faforever.api.user;
 
+import com.faforever.api.config.FafApiProperties;
 import com.google.common.collect.ImmutableMap;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@@ -13,14 +14,16 @@
 public class AnopeUserRepository {
 
   private final NamedParameterJdbcTemplate jdbcTemplate;
+  private String anopeDatabaseName;
 
-  public AnopeUserRepository(NamedParameterJdbcTemplate jdbcTemplate) {
+  public AnopeUserRepository(NamedParameterJdbcTemplate jdbcTemplate, FafApiProperties properties) {
     this.jdbcTemplate = jdbcTemplate;
+    anopeDatabaseName = properties.getAnope().getDatabaseName();
   }
 
   // Don't make this package private, see https://jira.spring.io/browse/SPR-15911
   public void updatePassword(String username, String password) {
-    jdbcTemplate.update("UPDATE `faf-anope`.anope_db_NickCore SET pass = :password WHERE display = :username",
+    jdbcTemplate.update("UPDATE `" + anopeDatabaseName + "`.anope_db_NickCore SET pass = :password WHERE display = :username",
       ImmutableMap.of(
         "password", password,
         "username", username

diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml
@@ -18,6 +18,8 @@ faf-api:
   git-hub:
     access-token: ${GITHUB_ACCESS_TOKEN:false}
     webhook-secret: ${GITHUB_WEBHOOK_SECRET:false}
+  anope:
+    database-name: ${ANOPE_DATABASE_NAME:faf-anope}
 
 spring:
   application: