aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjaseg <code@jaseg.net>2020-12-30 13:15:42 +0100
committerjaseg <code@jaseg.net>2020-12-30 13:15:42 +0100
commit92f9ae6cd7c82bf3f6e2c69b5de6da4319b5efa6 (patch)
tree1f8c2c57651721f71e72db145a41b45e4cd4fab9
parent7a3ec8f39e75075e050064162a16d84c4cfe8b01 (diff)
downloadinfra-92f9ae6cd7c82bf3f6e2c69b5de6da4319b5efa6.tar.gz
infra-92f9ae6cd7c82bf3f6e2c69b5de6da4319b5efa6.tar.bz2
infra-92f9ae6cd7c82bf3f6e2c69b5de6da4319b5efa6.zip
Move gerbolyze, secure-download checkouts into subdirectory
-rw-r--r--.gitmodules6
m---------checkouts/gerbolyze0
m---------checkouts/secure-download0
-rw-r--r--setup_gerboweb.yml5
-rw-r--r--setup_pogojig.yml2
-rw-r--r--setup_secure_download.yml3
6 files changed, 8 insertions, 8 deletions
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
+Subproject cfcf4c53955a70e896511e30cda206c1dd08109
diff --git a/checkouts/secure-download b/checkouts/secure-download
new file mode 160000
+Subproject 47329bf3bfc4a4a1b6c430adaf1616871b78911
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