Skip to content

Commit 90b19be

Browse files
committed
Create user first; setup webserver config last
1 parent 28d2c90 commit 90b19be

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

playbook.yml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
hosts: all
44
remote_user: root
55
roles:
6+
- user
67
- rvm_io.ruby
78
- s3cmd
89
- nodejs

roles/nginx-passenger/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
- name: nginx - enable the app
6767
file:
6868
state: link
69-
src: {{ nginx_conf_file }}
69+
src: "{{ nginx_conf_file }}"
7070
dest: /etc/nginx/sites-enabled/{{ app_name }}
7171

7272
- name: nginx - restart

roles/user/tasks/main.yml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
- name: create deploy user
2+
user: name={{ deploy_user }} shell=/bin/bash append=true
3+
4+
- name: add deploy user public key to authorized_keys
5+
authorized_key: user={{ deploy_user }} key=https://github.com/{{ gh_pubkey_user }}.keys
6+
7+
- name: add deploy user to sudoers
8+
lineinfile:
9+
"dest=/etc/sudoers
10+
regexp='^{{ deploy_user }} ALL'
11+
line='{{ deploy_user }} ALL=(ALL) NOPASSWD: ALL'
12+
state=present"

roles/webserver/tasks/main.yml

+1-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
- name: create deploy user
2-
user: name={{ deploy_user }} shell=/bin/bash append=true
3-
4-
- name: add deploy user public key to authorized_keys
5-
authorized_key: user={{ deploy_user }} key=https://github.com/{{ gh_pubkey_user }}.keys
6-
7-
- name: add deploy user to sudoers
8-
lineinfile:
9-
"dest=/etc/sudoers
10-
regexp='^{{ deploy_user }} ALL'
11-
line='{{ deploy_user }} ALL=(ALL) NOPASSWD: ALL'
12-
state=present"
13-
141
- name: create deploy directory
152
file: path={{ deploy_directory }} state=directory owner={{ deploy_user }} group={{ webserver_user }} mode=0775
163

@@ -23,4 +10,4 @@
2310
- libxslt-dev
2411
- libxml2-dev
2512
- libmysqlclient-dev
26-
- imagemagick
13+
- imagemagick

0 commit comments

Comments
 (0)