Skip to content

Commit 5241fcc

Browse files
committed
Merge branch 'gh271_ansible_and_nginx'
Fix #271
2 parents d9157ba + 226d802 commit 5241fcc

File tree

9 files changed

+158
-1
lines changed

9 files changed

+158
-1
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@ src/main/javascript/*/*.min.js
2222
.vagrant/
2323
vagrant/provisioning/vagrant.retry
2424
vagrant/provisioning/roles/php-coder.oraclejdk/
25+
vagrant/provisioning/roles/php-coder.nginx/
26+
vagrant/provisioning/roles/mystamps-nginx/files/prod/my-stamps.ru.key
27+
vagrant/provisioning/roles/mystamps-nginx/files/prod/my-stamps.ru.crt

vagrant/Vagrantfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ Vagrant.configure(2) do |config|
2929
# Create a forwarded port mapping which allows access to a specific port
3030
# within the machine from a port on the host machine. In the example below,
3131
# accessing "localhost:8080" will access port 80 on the guest machine.
32-
# config.vm.network "forwarded_port", guest: 80, host: 8080
32+
config.vm.network "forwarded_port", guest: 80, host: 8080
33+
config.vm.network "forwarded_port", guest: 443, host: 8443
3334

3435
# Provider-specific configuration so you can fine-tune various
3536
# backing providers for Vagrant. These expose provider-specific options.

vagrant/provisioning/roles/mystamps-app/tasks/main.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@
1818
dest: /etc/init.d/mystamps
1919
state: link
2020

21+
- name: Creating /data/logs
22+
file:
23+
path: /data/logs
24+
owner: mystamps
25+
group: mystamps
26+
mode: '0755'
27+
state: directory
28+
2129
- name: Running service
2230
service:
2331
name: mystamps
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDATCCAemgAwIBAgIJALTWADgGEENQMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
3+
BAMMDG15LXN0YW1wcy5ydTAeFw0xNjA2MjMxMTQ2MTBaFw0yNjA2MjExMTQ2MTBa
4+
MBcxFTATBgNVBAMMDG15LXN0YW1wcy5ydTCCASIwDQYJKoZIhvcNAQEBBQADggEP
5+
ADCCAQoCggEBANjO9+/4ViDn/et8hZ0sxJFst1Uc9H+JJ7mermfyNFaRKYdnFpOL
6+
BC/64wjbepxXber2kPw3yvMYT/W3Tn4TH0tl9wZZKB/37JTSneMdVF9G+F1YmieB
7+
aVsu6rjmV2DBbpnvkdt/z3lbVK0AJMJXENh+FLQbMn4yzgsTmjPnw+Gvo/qZdPpw
8+
mvGbyq8ygwrgMUIwnBrzogQYWHP3CIal3s+5f3z1wSF7A3NPFxYCSpAsSYy/DgMo
9+
UTR+Ha+mMaYEfOiqM8FX7XaQ1a7TZxCvC+0vig1yBbJ7sScTB3N7+Ya5eTssRH3e
10+
yb2Mks8LNPsMjHZZDQep/SsMfSdRzNV26JUCAwEAAaNQME4wHQYDVR0OBBYEFLqw
11+
DjmaDxpI+n01DOjo3CRHNk3kMB8GA1UdIwQYMBaAFLqwDjmaDxpI+n01DOjo3CRH
12+
Nk3kMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAGjXEL+noC08/DTC
13+
RmR8wnY4p3+LgC4+nGRw1mTqiaL/llnaCZ7PoKLs9DQToDKtZ/IgMWfQ82/i0NyP
14+
w+hjUOIeF7OY+gHKSj0nhu2yVSXEbceV4pWByN5gr1JSXT036w+BvoJw7mMch6nY
15+
FLzqe78Rf7cZ46lzmlOdkzroQKA/xqnt1EgJjmRFwFhw400k+Z8X8wOpW7+/nKFG
16+
A5TebgQI7TBjIRuUvHIszN+aB4+aU/4Iv5qxy5niKC+Nkajb8Gl7gc9JdN5h2TSZ
17+
dA2cFHGKfYJcqMjVYqm1JxlL4f2RM+ebX5fzOE1UA9fay4nm1uYHx+3ch4FNGs7e
18+
I/Y9CKo=
19+
-----END CERTIFICATE-----
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
-----BEGIN RSA PRIVATE KEY-----
2+
MIIEowIBAAKCAQEA2M737/hWIOf963yFnSzEkWy3VRz0f4knuZ6uZ/I0VpEph2cW
3+
k4sEL/rjCNt6nFdt6vaQ/DfK8xhP9bdOfhMfS2X3BlkoH/fslNKd4x1UX0b4XVia
4+
J4FpWy7quOZXYMFume+R23/PeVtUrQAkwlcQ2H4UtBsyfjLOCxOaM+fD4a+j+pl0
5+
+nCa8ZvKrzKDCuAxQjCcGvOiBBhYc/cIhqXez7l/fPXBIXsDc08XFgJKkCxJjL8O
6+
AyhRNH4dr6YxpgR86KozwVftdpDVrtNnEK8L7S+KDXIFsnuxJxMHc3v5hrl5OyxE
7+
fd7JvYySzws0+wyMdlkNB6n9Kwx9J1HM1XbolQIDAQABAoIBAHWNkqVMUva4ktax
8+
x4h3E4V+GtFNR8w2w5FDVnEJxBMD1i6SWI1bHMQfFiZhSlOmm/SACBCY97NjBUfH
9+
QgnduGQbPxr0EGt085OltvHDn1Ghm1yRg9PTuRo1kBL84XeWqa9RVBZdcFLukDTV
10+
FRlCN+IKSpN1A6WlSk57LGrkSTL+FtGFWw58LDWva+bd0Zh6R2g0mkJ4uXo28gq8
11+
MDAQyw9LJ02pP/ulYw5LE4j0b5G0NHQCv3hTrm0aZ1gPuYuHpKIUDH1y0ja/NCeV
12+
jdjRWT0Yz1WF3j7vMQAMQmCoJqtXmjYTEd0fgFGI1aKF6yTsl2gnx/A5ZX/eytY8
13+
aonIFsECgYEA+d5qIB0cVA0TvxUBDox6kqJvfjH9G/i9fiKdr44oRewY0l+jOlyH
14+
1XJo5bDTDwgGZ2Uw+o5zf23yOX1eDTZtnOxHZMlusgd+oUBgo0OciWOUmCA/UB2s
15+
50MeR1rsDA0SYKRRf/upSaixIlB5hQegzZAMKRPGUqeTfRHiT1f/nlkCgYEA3iDh
16+
gXmkBjaBYIZ76oN4QD5LKeA9FWPdXYL4lhOHW7WEpZ26odKOahNp2MgDpHDZxnz5
17+
yPgp0BzoC+Od5+yxHLEfzcL+JESKbL/fyRJtZlnPpim8JDhdiVSUfzih22GpBABj
18+
qlr6g9WuVOgD83Mgnb1e+QSqdyMl7cqo2IXnrJ0CgYEAySedGC1XWPMOKo6mQygk
19+
pVfPmjB0K8icBKepemNfWKsxcGs95QYI9HUerYsk3rz/Ks30GEIGCVhh4JZk2Q4w
20+
QFyXPTRMwVX3Q6moIseThad9QNr1HXJGeAc4oQk5bpo3aUXftsDLEFmWAKH4snfp
21+
pJOKtqcMyg3OVqnHH0kgqEECgYAZLtUiHq5P3gIQ9W47Ciip7+YJm1iRgj7oiR6x
22+
tQkVhqDBPf6YtgxbTlQjtZlkHT8zV5viAvCKnZxZLLcMQjNaM2KNq1uwtOyUo7Q1
23+
UZeBkREPn4+q85D3LtWfDsaa3pmQ0JJ8D9By/djD24IHKbg66etIhBTnaN619NHr
24+
qlK3qQKBgEPRkgba4Ah+eayuawvzwE47nJje5z7Amb6G1vaR6bqmtZckNcKVEdx7
25+
CTFqRNKuOASt/W3B2WYLuMCjCQReBIkFIgxP1xS7JrKRm5lnmlQn3vhNhJ3rmhTO
26+
HI4nkG8QdwU4XXr4QnWGPig1v6ePkY0P5DprXAIZLUqIS5eb7cwH
27+
-----END RSA PRIVATE KEY-----
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
3+
- name: Restarting nginx service
4+
service:
5+
name: nginx
6+
state: restarted
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
---
2+
3+
- name: Removing default nginx configuration
4+
file:
5+
path: /etc/nginx/conf.d/default.conf
6+
state: absent
7+
notify:
8+
- Restarting nginx service
9+
10+
- name: Updating permissions on /data/logs
11+
file:
12+
path: /data/logs
13+
group: nginx
14+
mode: '0775'
15+
state: directory
16+
17+
- name: Creating /data/nginx
18+
file:
19+
path: /data/nginx
20+
owner: root
21+
group: root
22+
mode: '0755'
23+
state: directory
24+
25+
- name: Uploading configuration files
26+
copy:
27+
src: "../../src/main/config/nginx/{{ item }}"
28+
dest: "/etc/nginx/conf.d/{{ item }}"
29+
force: yes
30+
backup: no
31+
owner: root
32+
group: root
33+
mode: '0644'
34+
with_items:
35+
- mystamps-http.conf
36+
- mystamps-ssl.conf
37+
notify:
38+
- Restarting nginx service
39+
40+
- name: Uploading data files
41+
copy:
42+
src: "../../src/main/config/nginx/{{ item }}"
43+
dest: "/data/nginx/{{ item }}"
44+
force: yes
45+
backup: no
46+
owner: root
47+
group: root
48+
mode: '0644'
49+
with_items:
50+
- 503.en.html
51+
- 503.ru.html
52+
notify:
53+
- Restarting nginx service
54+
55+
- name: Uploading certificate (.key file)
56+
copy:
57+
src: "{{ item }}"
58+
dest: "/etc/ssl/{{ item | basename }}"
59+
force: yes
60+
backup: no
61+
owner: root
62+
group: nginx
63+
mode: '0640'
64+
with_first_found:
65+
- prod/my-stamps.ru.key
66+
- my-stamps.ru.key
67+
notify:
68+
- Restarting nginx service
69+
70+
- name: Uploading certificate (.crt file)
71+
copy:
72+
src: "{{ item }}"
73+
dest: "/etc/ssl/{{ item | basename }}"
74+
force: yes
75+
backup: no
76+
owner: root
77+
group: nginx
78+
mode: '0640'
79+
with_first_found:
80+
- prod/my-stamps.ru.crt
81+
- my-stamps.ru.key
82+
notify:
83+
- Restarting nginx service

vagrant/provisioning/vagrant.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,11 @@
3232
- role: mystamps-app
3333
become: yes
3434
become_method: sudo
35+
36+
- role: php-coder.nginx
37+
become: yes
38+
become_method: sudo
39+
40+
- role: mystamps-nginx
41+
become: yes
42+
become_method: sudo

vagrant/requirements.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
- src: php-coder.oraclejdk
22
version: '1.3'
3+
- src: php-coder.nginx
4+
version: '1.1'

0 commit comments

Comments
 (0)