From c0e75f6c824eb389bab40b121dbbeea9c6009079 Mon Sep 17 00:00:00 2001 From: Itamar Hassin Date: Sat, 16 Apr 2016 18:58:27 -0400 Subject: [PATCH] Fixes syntax error in sudoers file. Renames playbook to web-playbook to be compatible with Vagrantfile --- infra/roles/common/handlers/main.yml | 6 ------ infra/roles/common/tasks/main.yml | 2 +- infra/roles/webserver/handlers/main.yml | 1 - infra/{playbook.yml => web-playbook.yml} | 1 - readme.md | 3 ++- 5 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 infra/roles/common/handlers/main.yml delete mode 100644 infra/roles/webserver/handlers/main.yml rename infra/{playbook.yml => web-playbook.yml} (91%) diff --git a/infra/roles/common/handlers/main.yml b/infra/roles/common/handlers/main.yml deleted file mode 100644 index 157c33d..0000000 --- a/infra/roles/common/handlers/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - - name: restart ntp - command: sudo /etc/init.d/ntp restart - - - name: restart sshd - command: sudo /etc/init.d/sshd restart diff --git a/infra/roles/common/tasks/main.yml b/infra/roles/common/tasks/main.yml index 961ea36..47fc991 100644 --- a/infra/roles/common/tasks/main.yml +++ b/infra/roles/common/tasks/main.yml @@ -9,7 +9,7 @@ authorized_key: user=root key="{{ lookup('file', '~/.ssh/id_rsa.pub') }}" - name: Set {{user}} as sudoer - lineinfile: dest=/etc/sudoers line="{{user}} ALL=(ALL) NOPASSWD ":" ALL" + lineinfile: dest=/etc/sudoers line="{{user}} ALL=(ALL) NOPASSWD:ALL" - name: Remove ubuntu's user user: name=ubuntu state=absent remove=yes diff --git a/infra/roles/webserver/handlers/main.yml b/infra/roles/webserver/handlers/main.yml deleted file mode 100644 index ed97d53..0000000 --- a/infra/roles/webserver/handlers/main.yml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/infra/playbook.yml b/infra/web-playbook.yml similarity index 91% rename from infra/playbook.yml rename to infra/web-playbook.yml index 6e6335b..9af5483 100644 --- a/infra/playbook.yml +++ b/infra/web-playbook.yml @@ -1,6 +1,5 @@ --- - hosts: webserver - remote_user: root roles: - common - { role: kamaln7.swapfile, swapfile_size: 1GB, swapfile_swappiness: 10 } diff --git a/readme.md b/readme.md index 693a646..72c82eb 100644 --- a/readme.md +++ b/readme.md @@ -50,7 +50,7 @@ Cucumber tests will require the local server to be running. - Configure your server with Ansible: ``` - $ ansible-playbook -i inventory-prod.ini playbook.yml + $ ansible-playbook -i inventory-prod.ini web-playbook.yml ``` This installs Ruby, Postgres, Nginx, and may take some time on the first run. - Then go back & deploy skedge to it: @@ -59,3 +59,4 @@ Cucumber tests will require the local server to be running. $ cd .. $ cap production deploy ``` +