From 92f9ae6cd7c82bf3f6e2c69b5de6da4319b5efa6 Mon Sep 17 00:00:00 2001 From: jaseg Date: Wed, 30 Dec 2020 13:15:42 +0100 Subject: Move gerbolyze, secure-download checkouts into subdirectory --- .gitmodules | 6 ++++++ checkouts/gerbolyze | 1 + checkouts/secure-download | 1 + setup_gerboweb.yml | 5 +---- setup_pogojig.yml | 2 -- setup_secure_download.yml | 3 +-- 6 files changed, 10 insertions(+), 8 deletions(-) create mode 160000 checkouts/gerbolyze create mode 160000 checkouts/secure-download diff --git a/.gitmodules b/.gitmodules index 866dd3a..56f5f0f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,9 @@ [submodule "library/ansible-collection"] path = library/inwx-collection url = https://github.com/inwx/ansible-collection +[submodule "checkouts/gerbolyze"] + path = checkouts/gerbolyze + url = https://git.jaseg.de/gerbolyze.git +[submodule "checkouts/secure-download"] + path = checkouts/secure-download + url = https://git.jaseg.de/secure-download.git diff --git a/checkouts/gerbolyze b/checkouts/gerbolyze new file mode 160000 index 0000000..cfcf4c5 --- /dev/null +++ b/checkouts/gerbolyze @@ -0,0 +1 @@ +Subproject commit cfcf4c53955a70e896511e30cda206c1dd081099 diff --git a/checkouts/secure-download b/checkouts/secure-download new file mode 160000 index 0000000..47329bf --- /dev/null +++ b/checkouts/secure-download @@ -0,0 +1 @@ +Subproject commit 47329bf3bfc4a4a1b6c430adaf1616871b789110 diff --git a/setup_gerboweb.yml b/setup_gerboweb.yml index 6a20eed..428cb98 100644 --- a/setup_gerboweb.yml +++ b/setup_gerboweb.yml @@ -27,11 +27,8 @@ - name: Copy webapp sources synchronize: - # FIXME: make this path configurable - src: ~/gerbolyze/gerboweb/ + src: checkouts/gerbolyze/gerboweb/ dest: /var/lib/gerboweb/ - rsync_opts: - - "--exclude=/deploy" group: no owner: no diff --git a/setup_pogojig.yml b/setup_pogojig.yml index cf49fbe..4a198f6 100644 --- a/setup_pogojig.yml +++ b/setup_pogojig.yml @@ -17,14 +17,12 @@ - name: Install pogojig synchronize: - # FIXME: make this path configurable src: checkouts/pogojig/renderer/ dest: "{{pogojig_root}}/var/lib/pogojig_renderer" group: no - name: Copy webapp sources synchronize: - # FIXME: make this path configurable src: checkouts/pogojig/webapp/ dest: /var/lib/pogojig delete: true diff --git a/setup_secure_download.yml b/setup_secure_download.yml index aa94a53..7fe37de 100644 --- a/setup_secure_download.yml +++ b/setup_secure_download.yml @@ -5,8 +5,7 @@ - name: Copy webapp sources synchronize: - # FIXME: make this path configurable - src: ~/secure_download/ + src: checkouts/secure_download/ dest: /var/lib/secure_download/ group: no owner: no -- cgit