Random incremental fixes

* Enable npm role
* Minor edits to debian dependency list
* Change treatment of a few files and directories

playbooks/edxapp_custom.yml

@@ -8,4 +8,7 @@
   roles:
     - common
     - nginx
+    - gunicorn
     - lms
+    - ruby
+    - npm

playbooks/edxapp_prod.yml

@@ -9,3 +9,4 @@
     - gunicorn
     - lms
     - ruby
+    - npm

playbooks/edxapp_stage.yml

@@ -9,3 +9,4 @@
     - gunicorn
     - lms
     - ruby
+    - npm

playbooks/roles/cms/tasks/main.yml

@@ -7,13 +7,21 @@
   template: src=env.json.j2 dest=$app_base_dir/cms.env.json
   sudo: True
   tags:
+  - cms-env
   - cms
 
 - name: create cms auth file
   template: src=auth.json.j2 dest=$app_base_dir/cms.auth.json
   sudo: True
   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

playbooks/roles/cms/templates/auth.json.j2

@@ -1 +1,2 @@
+{# {% do auth_config.update( { < override some hash keys > } )  %} #}
 {{ auth_config | to_nice_json }}

playbooks/roles/common/tasks/main.yml

@@ -1,11 +1,24 @@
 ---
 - include: create_users.yml
 - name: Create application root
-  file: path=$app_base_dir state=directory owner=root group=root
+  # In the future consider making group edx r/t adm
+  file: path=$app_base_dir state=directory owner=root group=adm mode=2775 
   sudo: True
+  tags:
+  - pre_install
 - name: Create log directory
-  file: path=/mnt/logs state=directory
+  file: path=/mnt/logs state=directory mode=2770 group=adm owner=root
   sudo: True
+  tags:
+  - pre_install
+- name: Create aliases to the log directory
+  file: state=link src=/mnt/logs path=$app_base_dir/log
+  tags:
+  - pre_install
+- name: Touch the edx log file into place 
+  command: touch -a /mnt/logs/edx.log
+  tags:
+  - pre_install
 - name: Update apt cache
   apt: update_cache=yes
   sudo: True

playbooks/roles/lms/tasks/main.yml

@@ -41,12 +41,6 @@
   - cms
 
 # Check out mitx repo to $app_base_dir
-- name: set permissions on $app_base_dir sgid for adm
-  file: path=$app_base_dir owner=root group=adm mode=2775 state=directory
-  sudo: True
-  tags:
-  - lms
-  - cms
 - name: install git and its recommends
   apt: pkg=git state=present install_recommends=yes 
   sudo: True

playbooks/roles/lms/vars/main.yml

@@ -85,6 +85,8 @@ lms_debian_pkgs:
   - libxml2-dev
   - libxml2-utils
   - libxslt1-dev
+  # convenience
+  - lynx-cur
   - maven2
   - mongodb
   - mongodb-clients
@@ -97,11 +99,6 @@ lms_debian_pkgs:
   - perl
   - pkg-config
   - postfix
-  #- puppet
-  #- puppet-common
-  #- puppet-lint
-  #- puppetmaster
-  #- puppetmaster-common
   - pylint
   - python-boto
   - python-coverage-test-runner
@@ -119,7 +116,6 @@ lms_debian_pkgs:
   - sqlite3
   - super
   - vagrant
-  - vim-puppet
   - yui-compressor
   - zip
   - zlib1g-dev