Seperated mongo db database name from URI string to support replica sets

with authentication
chrisipa · Oct 22, 2018 · 5f34f55 · 5f34f55
1 parent 0bed136
commit 5f34f55
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/installer/roles/cloud-portal/templates/docker-compose.yml b/installer/roles/cloud-portal/templates/docker-compose.yml
@@ -33,6 +33,7 @@ tomcat:
     - 'MAIL_HOST={{ mail_host }}'
     - 'MAIL_SEND={{ mail_send }}'
     - 'MONGO_DB_URI={{ mongo_db_uri }}'
+    - 'MONGO_DB_DATABASE={{ mongo_db_database }}'
 
 apache:
   image: 'chrisipa/apache:latest'

diff --git a/installer/vars.json b/installer/vars.json
@@ -4,7 +4,8 @@
   "tomcat_ajp_port" : "8009",
   "apache_http_port" : "80",
   "apache_https_port" : "443",
-  "mongo_db_uri" : "mongodb://mongodb:27017/cloud-portal",
+  "mongo_db_uri" : "mongodb://mongodb:27017",
+  "mongo_db_database" : "cloud-portal",
   "application_folder" : "/opt/cloud-portal",
   "application_title" : "Cloud Portal",  
   "application_url" : "http://localhost:8080",

diff --git a/modules/cloud-portal-server/README.md b/modules/cloud-portal-server/README.md
@@ -48,7 +48,8 @@ Self service web portal for different Cloud platforms like Azure, AWS and VMware
       - 'MAIL_CC=my-cc-account@my-domain.com'
       - 'MAIL_HOST=my-mail-server'
       - 'MAIL_SEND=true'
-      - 'MONGO_DB_URI=mongodb://mongodb:27017/cloud-portal'
+      - 'MONGO_DB_URI=mongodb://mongodb:27017'
+      - 'MONGO_DB_DATABASE=cloud-portal'
   ```
 
 * Run docker containers with docker compose:

diff --git a/modules/cloud-portal-server/pom.xml b/modules/cloud-portal-server/pom.xml
@@ -192,7 +192,7 @@
                                     <port>${tomcat.https.port}:${tomcat.https.port}</port>
                                 </ports>
                                 <env>
-                                    <MONGO_DB_URI>mongodb://mongodb:27017/cloud-portal</MONGO_DB_URI>
+                                    <MONGO_DB_URI>mongodb://mongodb:27017</MONGO_DB_URI>
                                 </env>
                             </run>
                         </image>

diff --git a/modules/cloud-portal-server/src/main/resources/application.properties b/modules/cloud-portal-server/src/main/resources/application.properties
@@ -15,7 +15,8 @@ APPLICATION_DATE_FORMAT=dd.MM.yyyy HH:mm:ss
 # MONGO DB #
 ############
 
-MONGO_DB_URI=mongodb://localhost:27017/cloud-portal
+MONGO_DB_URI=mongodb://localhost:27017
+MONGO_DB_DATABASE=cloud-portal
 
 
 ########
@@ -77,4 +78,5 @@ ENCRYPTOR_SECRET=pbGaynvta#ZvpF^@XzE%
 
 spring.mvc.view.prefix=/WEB-INF/jsp/
 spring.mvc.view.suffix=.jsp
-spring.data.mongodb.uri=${MONGO_DB_URI}
+spring.data.mongodb.uri=${MONGO_DB_URI}
+spring.data.mongodb.database=${MONGO_DB_DATABASE}