From 9ff8a6b24c5faf4fdefbe1b1cd51215ac8b6d6d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felipe=20Mart=C3=ADn?= Date: Wed, 9 Sep 2015 21:12:40 +0200 Subject: [PATCH] Provision updates for web-01 --- provision/host_vars/web-01.yml | 6 ++++++ provision/hosts | 3 +++ provision/roles/app_deploy/tasks/django.yml | 7 +++++++ provision/roles/nginx/files/host.conf | 4 ++-- provision/roles/nginx/tasks/main.yml | 6 +++--- provision/roles/system/tasks/tools.yml | 6 ++++++ 6 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 provision/host_vars/web-01.yml diff --git a/provision/host_vars/web-01.yml b/provision/host_vars/web-01.yml new file mode 100644 index 0000000..7de1484 --- /dev/null +++ b/provision/host_vars/web-01.yml @@ -0,0 +1,6 @@ +site_hostname: beta.amiibofindr.com + +site_media_hostname: beta.media.amiibofindr.com +site_static_hostname: beta.static.amiibofindr.com + +enable_ssl: false diff --git a/provision/hosts b/provision/hosts index 9228a5b..ff2e5ca 100644 --- a/provision/hosts +++ b/provision/hosts @@ -1,5 +1,6 @@ vagrant ansible_ssh_host=127.0.0.1 ansible_ssh_user=vagrant ansible_ssh_port=2222 web-1 ansible_ssh_host=46.101.172.158 ansible_ssh_user=root ansible_ssh_port=22 +web-01 ansible_ssh_host=139.162.149.24 ansible_ssh_user=root ansible_ssh_port=22 [localdev] vagrant @@ -8,6 +9,8 @@ vagrant [production] web-1 +web-01 [deploy] web-1 +web-01 diff --git a/provision/roles/app_deploy/tasks/django.yml b/provision/roles/app_deploy/tasks/django.yml index c0cad51..0e37867 100644 --- a/provision/roles/app_deploy/tasks/django.yml +++ b/provision/roles/app_deploy/tasks/django.yml @@ -13,3 +13,10 @@ app_path={{ deploy_path.stdout }}/git virtualenv=/home/{{ app_user }}/virtualenv settings=amiibofindr.settings.local + +- name: Performs manage.py compilemessages + django_manage: > + command=compilemessages + app_path={{ deploy_path.stdout }}/git + virtualenv=/home/{{ app_user }}/virtualenv + settings=amiibofindr.settings.local diff --git a/provision/roles/nginx/files/host.conf b/provision/roles/nginx/files/host.conf index a4267fa..db7bb68 100644 --- a/provision/roles/nginx/files/host.conf +++ b/provision/roles/nginx/files/host.conf @@ -20,8 +20,8 @@ server { client_max_body_size 50M; charset utf-8; - access_log {{ app_logs_folder }}/nginx-ecommerce.access.log; - error_log {{ app_logs_folder }}/nginx-ecommerce.error.log; + access_log {{ app_logs_folder }}/ngin.access.log; + error_log {{ app_logs_folder }}/nginx.error.log; {% if enable_ssl %} ssl_certificate /etc/nginx/ssl/certificate.pem; diff --git a/provision/roles/nginx/tasks/main.yml b/provision/roles/nginx/tasks/main.yml index 07832d6..42e629f 100644 --- a/provision/roles/nginx/tasks/main.yml +++ b/provision/roles/nginx/tasks/main.yml @@ -16,6 +16,6 @@ file: src=/etc/nginx/sites-available/{{ app_user }} dest=/etc/nginx/sites-enabled/{{ app_user }} state=link sudo: true -- name: Restart nginx - service: name=nginx state=restarted - sudo: true +#- name: Restart nginx +# service: name=nginx state=restarted +# sudo: true diff --git a/provision/roles/system/tasks/tools.yml b/provision/roles/system/tasks/tools.yml index c7346d5..d8ed383 100644 --- a/provision/roles/system/tasks/tools.yml +++ b/provision/roles/system/tasks/tools.yml @@ -7,3 +7,9 @@ - name: Ensure git is installed apt: pkg=git state=latest sudo: true + +- name: ensure requirements are installed + apt: pkg={{ item }} state=latest + sudo: true + with_items: + - gettext