diff options
| author | Aaron LI <aly@aaronly.me> | 2018-03-05 19:27:06 +0800 |
|---|---|---|
| committer | Aaron LI <aly@aaronly.me> | 2018-03-14 11:35:08 +0800 |
| commit | d9b877957c52789e494aeee1ffd4d3128dd9e597 (patch) | |
| tree | a1ad213d957d789473b4de2a444efc6ee5a47cc2 | |
| parent | de51948fd19f05dbeb4eb5ea0cfd6bc46713abd1 (diff) | |
| download | ansible-dfly-vps-d9b877957c52789e494aeee1ffd4d3128dd9e597.tar.bz2 | |
web: create files/{acme,nginx} to organize files better
| -rwxr-xr-x | roles/web/files/acme/acme-client.sh (renamed from roles/web/files/acme-client.sh) | 0 | ||||
| -rwxr-xr-x | roles/web/files/acme/deploy.sh (renamed from roles/web/files/deploy.sh) | 0 | ||||
| -rw-r--r-- | roles/web/files/nginx/conf.d/security_headers.conf (renamed from roles/web/files/conf.d/security_headers.conf) | 0 | ||||
| -rw-r--r-- | roles/web/files/nginx/conf.d/ssl.conf (renamed from roles/web/files/conf.d/ssl.conf) | 0 | ||||
| -rw-r--r-- | roles/web/files/nginx/nginx.conf (renamed from roles/web/files/nginx.conf) | 0 | ||||
| -rw-r--r-- | roles/web/tasks/main.yml | 9 |
6 files changed, 4 insertions, 5 deletions
diff --git a/roles/web/files/acme-client.sh b/roles/web/files/acme/acme-client.sh index 1f4b15d..1f4b15d 100755 --- a/roles/web/files/acme-client.sh +++ b/roles/web/files/acme/acme-client.sh diff --git a/roles/web/files/deploy.sh b/roles/web/files/acme/deploy.sh index 9c6fff2..9c6fff2 100755 --- a/roles/web/files/deploy.sh +++ b/roles/web/files/acme/deploy.sh diff --git a/roles/web/files/conf.d/security_headers.conf b/roles/web/files/nginx/conf.d/security_headers.conf index f4a7135..f4a7135 100644 --- a/roles/web/files/conf.d/security_headers.conf +++ b/roles/web/files/nginx/conf.d/security_headers.conf diff --git a/roles/web/files/conf.d/ssl.conf b/roles/web/files/nginx/conf.d/ssl.conf index acda0eb..acda0eb 100644 --- a/roles/web/files/conf.d/ssl.conf +++ b/roles/web/files/nginx/conf.d/ssl.conf diff --git a/roles/web/files/nginx.conf b/roles/web/files/nginx/nginx.conf index 760ca02..760ca02 100644 --- a/roles/web/files/nginx.conf +++ b/roles/web/files/nginx/nginx.conf diff --git a/roles/web/tasks/main.yml b/roles/web/tasks/main.yml index c1d6b17..d554db1 100644 --- a/roles/web/tasks/main.yml +++ b/roles/web/tasks/main.yml @@ -30,7 +30,7 @@ - name: nginx - copy conf.d/ config directory copy: - src: conf.d/ # trailing '/' -> directory contents + src: nginx/conf.d/ # trailing '/' -> directory contents dest: /usr/local/etc/nginx/conf.d/ - name: nginx - create sites/ directory @@ -43,7 +43,7 @@ - name: nginx - copy nginx.conf copy: - src: nginx.conf + src: nginx/nginx.conf dest: /usr/local/etc/nginx/nginx.conf # XXX: Validation runs aganist a temporary file, thus nginx fails to # include other config files! @@ -69,9 +69,8 @@ src: "{{ item }}" dest: /usr/local/etc/acme/{{ item | basename }} mode: 0755 - with_items: - - acme-client.sh - - deploy.sh + with_fileglob: + - "acme/*.sh" - name: (local) acme - check account private key existence become: false |