Skip to content

Commit bb8d1eb

Browse files
committed
Split / relicense web files
1 parent cf89897 commit bb8d1eb

File tree

9 files changed

+447
-13
lines changed

9 files changed

+447
-13
lines changed

LICENSE.CC-BY-SA.4.0

+428
Large diffs are not rendered by default.

LICENSE LICENSE.GPL3

File renamed without changes.

LICENSE.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Unless otherwise specified, Ansible code and supporting scripts are licensed under the [GPLv3](LICENSE.GPL3).
2+
3+
Web content (`web/`) is licensed under [CC-BY-SA 4.0](LICENSE.CC-BY-SA.4.0).

roles/upload-splash-site/tasks/main.yml

+16-12
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,32 @@
33
path: "{{ automation_root_dir }}/splash"
44
state: directory
55

6-
- name: Upload splash page files
7-
template:
8-
src: index-dn42.html.j2
9-
dest: "{{ automation_root_dir }}/splash/index-dn42.html"
10-
- name: Upload splash page files
11-
template:
12-
src: index-clearnet.html.j2
13-
dest: "{{ automation_root_dir }}/splash/index-clearnet.html"
146
- name: Upload splash page files
157
copy:
16-
src: style.css
17-
dest: "{{ automation_root_dir }}/splash/style.css"
8+
src: "{{ item }}"
9+
dest: "{{ automation_root_dir }}/splash/"
10+
with_fileglob:
11+
- "{{ playbook_dir }}/web/*.html"
12+
- "{{ playbook_dir }}/web/*.htm"
13+
- "{{ playbook_dir }}/web/*.css"
14+
- "{{ playbook_dir }}/web/*.js"
15+
16+
- name: Template splash page files
17+
template:
18+
src: "{{ item }}"
19+
dest: "{{ automation_root_dir }}/splash/{{ item | basename | regex_replace('\\.j2$', '')}}"
20+
with_fileglob:
21+
- "{{ playbook_dir }}/web/*.j2"
1822

19-
- name: Setup splash page for dn42
23+
- name: Configure splash page for dn42 in nginx
2024
include_role:
2125
name: apps_nginx
2226
vars:
2327
nginx_site:
2428
src: dn42-splash.conf.j2
2529
dst: dn42-splash.conf
2630

27-
- name: Setup splash page for clearnet
31+
- name: Configure splash page for clearnet in nginx
2832
include_role:
2933
name: apps_nginx
3034
vars:

roles/upload-splash-site/templates/style.css

-1
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)