Merge pull request #52 from edx/jbau/cms

Jbau/cms

playbooks/edxapp_prod.yml

@@ -9,6 +9,7 @@
     - nginx
     - gunicorn
     - lms
+    - cms
     - ruby
     - npm
     # run this role last

playbooks/roles/cms/tasks/main.yml

@@ -4,22 +4,20 @@
 #  - nginx/tasks/main.yml
 ---
 - name: create cms application config
-  template: src=env.json.j2 dest=$app_base_dir/cms.env.json
+  template: src=env.json.j2 dest=$app_base_dir/cms.env.json mode=644
   tags:
   - cms-env
   - cms
 
 - name: create cms auth file
-  template: src=auth.json.j2 dest=$app_base_dir/cms.auth.json
+  template: src=auth.json.j2 dest=$app_base_dir/cms.auth.json mode=644
   tags:
   - cms-env
   - cms
 
 - include: ../../nginx/tasks/nginx_site.yml state=link site_name=cms
-  tags:
-  - cms
-  - cms-env
+  
 - include: ../../nginx/tasks/nginx_site.yml state=link site_name=cms-backend
-  tags:
-  - cms
-  - cms-env
+
+# Creates LMS upstart file
+- include: ../../gunicorn/tasks/upstart.yml service_variant=cms

playbooks/roles/gunicorn/templates/cms.conf.j2

+# gunicorn
+ 
+description "gunicorn server"
+author "Calen Pennington <cpennington@mitx.mit.edu>"
+ 
+start on runlevel [2345]
+stop on runlevel [!2345]
+ 
+respawn
+respawn limit 3 30
+ 
+env PID=/var/tmp/cms.pid
+#env NEW_RELIC_CONFIG_FILE=${app_base_dir}/newrelic.ini
+#env NEWRELIC=${venv_dir}/bin/newrelic-admin
+env WORKERS={{ ansible_processor_cores * 2 }}
+env PORT=8010
+env LANG=en_US.UTF-8
+env DJANGO_SETTINGS_MODULE=cms.envs.aws
+env SERVICE_VARIANT="cms"
+ 
+ 
+chdir ${app_base_dir}/mitx
+setuid www-data
+ 
+exec ${venv_dir}/bin/gunicorn_django -b 127.0.0.1:$PORT -w $WORKERS --timeout=300 --pythonpath=${app_base_dir}/mitx --settings=cms.envs.aws

playbooks/roles/gunicorn/templates/lms.conf.j2

@@ -10,9 +10,9 @@ respawn
 respawn limit 3 30
 
 env PID=/var/tmp/lms.pid
-#env NEW_RELIC_CONFIG_FILE=${app_base_dir}/opt/wwc/newrelic.ini
-#env NEWRELIC=${app_base_dir}/bin/newrelic-admin
-env WORKERS=${lms_num_workers}
+#env NEW_RELIC_CONFIG_FILE=${app_base_dir}/newrelic.ini
+#env NEWRELIC=${venv_dir}/bin/newrelic-admin
+env WORKERS={{ ansible_processor_cores * 2 }}
 env PORT=8000
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE=lms.envs.aws

playbooks/roles/gunicorn/vars/main.yml

 ---
-lms_num_workers: 1
\ No newline at end of file

playbooks/roles/nginx/tasks/nginx_site.yml

@@ -10,6 +10,7 @@
   tags:
   - nginx
   - lms
+  - cms
   - nginx-env
 
 - name: Creating nginx config link {{ site_name }}
@@ -18,4 +19,5 @@
   tags:
   - nginx
   - lms
+  - cms
   - nginx-env

playbooks/secure_example/vars/edxapp_prod_vars.yml

@@ -72,3 +72,76 @@ lms_env_config:
   'LOGGING_ENV':  'hidden-prod'
   'SESSION_COOKIE_DOMAIN':  'hidden-prod'
   'COMMENTS_SERVICE_KEY':  'hidden-prod'
+
+cms_auth_config:
+  'AWS_ACCESS_KEY_ID':  'hidden-prod'
+  'AWS_SECRET_ACCESS_KEY':  'hidden-prod'
+  'CONTENTSTORE':
+    'OPTIONS':
+      'db':  'hidden-prod'
+      'host': [ 'hidden-prod',  'hidden-prod']
+      'password':  'hidden-prod'
+      'port': 0000 
+      'user':  'hidden-prod'
+  'DATABASES':
+    'default': { 'ENGINE':  'hidden-prod',
+      'HOST':  'hidden-prod',  'NAME':  'hidden-prod',
+      'PASSWORD':  'hidden-prod',  'PORT': 0000,
+      'USER':  'hidden-prod'}
+  'MODULESTORE':
+    'default':
+      'ENGINE': 'xmodule.modulestore.mongo.DraftMongoModuleStore'
+      'OPTIONS':
+        'collection':  'hidden-prod'
+        'db':  'hidden-prod'
+        'default_class':  'hidden-prod'
+        'fs_root':  'hidden-prod'
+        'host': [ 'hidden-prod',  'hidden-prod']
+        'password':  'hidden-prod'
+        'port': 0000
+        'render_template':  'hidden-prod'
+        'user':  'hidden-prod'
+    'direct':
+      'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore'
+      'OPTIONS':
+        'collection':  'hidden-prod'
+        'db':  'hidden-prod'
+        'default_class':  'hidden-prod'
+        'fs_root':  'hidden-prod'
+        'host': [ 'hidden-prod',  'hidden-prod']
+        'password':  'hidden-prod'
+        'port': 0000
+        'render_template':  'hidden-prod'
+        'user':  'hidden-prod'
+  'SECRET_KEY':  'hidden-prod'
+
+cms_env_config:
+  'CACHES':
+    'default':
+      'KEY_PREFIX':  'hidden-prod'
+      'LOCATION': [ 'hidden-prod',
+        'hidden-prod']
+    'general':
+      'KEY_PREFIX':  'hidden-prod'
+      'LOCATION': [ 'hidden-prod',
+        'hidden-prod']
+    'mongo_metadata_inheritance':
+      'KEY_PREFIX':  'hidden-prod'
+      'LOCATION': [ 'hidden-prod',
+        'hidden-prod']
+    'staticfiles':
+      'KEY_PREFIX':  'hidden-prod'
+      'LOCATION': [ 'hidden-prod',
+        'hidden-prod']
+  'LOG_DIR':  'hidden-prod'
+  'LOGGING_ENV': 'hidden-prod'
+  'SITE_NAME': 'hidden-prod'
+  'SYSLOG_SERVER': 'hidden-prod'
+  'LMS_BASE': 'hidden-prod'
+  'SESSION_COOKIE_DOMAIN': 'hidden-prod'
+  'SEGMENT_IO_KEY': 'hidden-prod'
+  'MITX_FEATURES':
+    'DISABLE_COURSE_CREATION': false
+    'SEGMENT_IO': false
+
+