remove ip tables, add config file back

Author: Anandkumar Patel

ansible/dock-init.yml

@@ -12,7 +12,6 @@
   roles:
   - { role: notify, tags: [notify] }
   - { role: docker, tags: [docker] }
-  - { role: iptables, tags: [iptables, security] }
   - { role: datadog }
   - { role: git_repo, tags: [deploy] }
   - { role: dock-init, tags: [deploy] }

ansible/group_vars/alpha-docker-listener.yml

@@ -10,8 +10,6 @@ enviroment_vars:
   RABBITMQ_PASSWORD: "{{ rabbit_password }}"
   RABBITMQ_PORT: "{{ rabbit_port }}"
   RABBITMQ_USERNAME: "{{ rabbit_username }}"
-  REDIS_IPADDRESS: "{{ redis_host_address }}"
-  REDIS_PORT: "{{ redis_port }}"
 
 # consul values
 consul_values:

ansible/roles/dock-init/tasks/main.yml

@@ -4,7 +4,6 @@
 
 - name: copy vault auth files
   tags: vault_files
-  sudo: yes
   lineinfile:
     dest="/opt/runnable/dock-init/consul-resources/vault/{{ node_env }}/{{ item.file_name }}"
     line="{{ item.value }}"

ansible/roles/node_service/tasks/main.yml

@@ -1,30 +1,37 @@
 ---
 - name: remove node_modules
+  tags: deploy
   when: remove_node_modules is defined
   file:
     path=/opt/runnable/{{ app_name }}/node_modules
     state=absent
 
 - name: npm install {{ app_name }}
+  tags: deploy
   npm:
     path=/opt/runnable/{{ app_name }}
     state=latest
     production=yes
 
-- name: add env to configs
-  tags: 'update_configs'
+- name: create new config file
   sudo: yes
-  when: enviroment_vars is defined
-  with_dict: "{{ enviroment_vars }}"
-  lineinfile:
+  template:
+    src=upstart.conf
     dest=/etc/init/{{ app_name }}.conf
-    regexp="env {{ item.key }}"
-    insertafter="env NPM_BIN"
-    line="env {{ item.key }}={{ item.value }}"
-    state=present
+    backup=yes
+
+- name: make override file
+  tags: deploy
+  sudo: yes
+  lineinfile:
+    dest="/etc/init/{{ app_name }}.override"
+    line="manual"
+    create=yes
 
 - name: restart service {{ app_name }}
+  tags: deploy
   sudo: yes
+  when: dock is not defined
   service:
     name={{ app_name }}
     state=restarted

ansible/roles/node_service/templates/upstart.conf

@@ -0,0 +1,41 @@
+#!upstart
+description "{{ app_name }}"
+author "Anandkumar Patel"
+
+env NPM_BIN=/usr/local/bin/npm
+env APP_DIR=/opt/runnable/{{ app_name }}
+env LOG_FILE=/var/log/{{ app_name }}.log
+env NODE_ENV={{ node_env }}
+
+{% if enviroment_vars is defined %}
+{% for name, value in enviroment_vars.iteritems() %}
+env {{ name }}={{ value }}
+{% endfor %}
+{% endif %}
+
+start on (local-filesystems and net-device-up IFACE=eth0)
+stop on shutdown
+
+script
+  touch $LOG_FILE
+  chdir $APP_DIR
+  echo $$ > /var/run/{{ app_name }}.pid
+  exec $NPM_BIN start >> $LOG_FILE 2>&1
+end script
+
+pre-start script
+  # Date format same as (new Date()).toISOString() for consistency
+  echo "[`date -u +%Y-%m-%dT%T.%3NZ`] (sys) Starting" >> $LOG_FILE
+end script
+
+pre-stop script
+  rm /var/run/{{ app_name }}.pid
+  echo "[`date -u +%Y-%m-%dT%T.%3NZ`] (sys) Stopping" >> $LOG_FILE
+end script
+
+post-start script
+  echo "===== App restarted =====" >> $LOG_FILE
+end script
+
+respawn
+respawn limit 5 1     # give up restart after 5 respawns in 1 seconds

ansible/stage-hosts/variables

@@ -1,12 +1,19 @@
 [stage:vars]
+api_hostname=api-staging-codenow.runnableapp.com
 aws_access_key_id=AKIAJ3RCYU6FCULAJP2Q
 aws_secret_access_key=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
 consul_host_address=consul-server-staging-codenow.runnableapp.com
+detention_hostname=detention-staging-codenow.runnableapp.com
 domain=runnable-angular-staging-codenow.runnableapp.com
+eru_hostname=admin-staging-codenow.runnableapp.com
+fluffy_hostname=fluffy-staging-codenow.runnableapp.com
+mavis_hostname=mavis-staging-codenow.runnableapp.com
 node_env=stageing
+optimus_hostname=optimus-staging-codenow.runnableapp.com
 rabbit_password=h7n972sPLs5tWGCWe6QPSCnaxDWjvnpEFEA9c9mBqauH3f22
 rabbit_username=5WE5wsEQmfw9sLsppJ4CEq9Auea8mPC4kgVt3xYqKxbYHPfP
 registry_host=10.8.4.126
+user_content_domain=runnable3.net
 vault_auth_token=ff3b5003-5949-5d7d-7c0d-4fa21efe6666
 vault_token_01=c9dd02cd0f28aaeb8b819d50d2b7b274dab5ddc7fc64871a979bcb4472c9355501
 vault_token_02=15cc2b24a82fd3876476dd28b48756f56b4a78d2a23d18f0faca390aaf17092e02