Commit e9ebcc2f by John Jarvis

resolving merge conflicts

parent fc7c932b
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
- common - common
- nginx - nginx
- edxlocal - edxlocal
- edxapp # - edxapp
- rabbitmq # - rabbitmq
- oraclejdk # - oraclejdk
- elasticsearch # - elasticsearch
- { role: 'edxapp', celery_worker: True } # - { role: 'edxapp', celery_worker: True }
- role: rbenv - role: rbenv
rbenv_user: "{{ forum_user }}" rbenv_user: "{{ forum_user }}"
rbenv_user_home: "{{ forum_home }}" rbenv_user_home: "{{ forum_home }}"
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
- name: wait for mongo server to start - name: wait for mongo server to start
wait_for: port=27017 delay=2 wait_for: port=27017 delay=2
- name: create a mongodb user for studio - name: create a mongodb user for edxapp
mongodb_user: > mongodb_user: >
database=edxapp database=edxapp
name=edxapp name=edxapp
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
- name: create a mongodb user for forums - name: create a mongodb user for forums
mongodb_user: > mongodb_user: >
database=forum database=cs_comments_service
name=cs_comments_service name=cs_comments_service
password=password password=password
state=present state=present
......
...@@ -10,8 +10,8 @@ forum_mongo_user: "cs_comments_service" ...@@ -10,8 +10,8 @@ forum_mongo_user: "cs_comments_service"
forum_mongo_password: "password" forum_mongo_password: "password"
forum_mongo_host: "localhost" forum_mongo_host: "localhost"
forum_mongo_port: "27010" forum_mongo_port: "27010"
forum_mongo_database: "forum" forum_mongo_database: "cs_comments_service"
forum_mongo_url: "mongodb://{{ forum_mongo_user }}:{{ forum_mongo_password }}@{{ forum_mongo_host }}:{{ forum_mongo_port }}/{{ forum_mongo_database }}" forum_mongo_url: "mongodb://{{ forum_mongo_user }}:{{ forum_mongo_password }}@{{ formum_mongo_host }}:{{ forum_mongo_port }}/{{ forum_mongo_database }}"
forum_rack_env: "development" forum_rack_env: "development"
forum_sinatra_env: "development" forum_sinatra_env: "development"
forum_api_key: "password" forum_api_key: "password"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment