Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d48ca85
backup functionality
morten-spiegel May 19, 2020
5e910a6
basic backup and restore working
morten-spiegel May 20, 2020
17bc00b
fixed multiple backup fail
morten-spiegel May 25, 2020
f5054d2
hypothesis backup and restore working
morten-spiegel May 27, 2020
cf5e65e
code cleanup
morten-spiegel May 27, 2020
aab5ade
merge
morten-spiegel May 27, 2020
0ec379f
flake8
morten-spiegel May 27, 2020
62b7882
flake8
morten-spiegel May 27, 2020
a50c767
removed unnecessary shard waiting
morten-spiegel May 27, 2020
00df650
removed duplicate code
morten-spiegel Jun 2, 2020
ef3e799
fixed alias error
morten-spiegel Jun 3, 2020
761d4a0
Merge branch 'master' of github.com:liquidinvestigations/node into li…
morten-spiegel Jun 9, 2020
2420ce4
Merge branch 'master' of github.com:liquidinvestigations/node into li…
morten-spiegel Jun 22, 2020
ebe6c2b
run as non root
morten-spiegel Aug 5, 2020
d0ee7f5
merged
morten-spiegel Aug 5, 2020
5cd3720
commit before holidays
morten-spiegel Aug 7, 2020
5604224
commit before holidays
morten-spiegel Aug 7, 2020
5879819
Merge branch 'master' of github.com:liquidinvestigations/node into no…
morten-spiegel Aug 26, 2020
b4d5a7a
working deploy
morten-spiegel Aug 26, 2020
445e975
change to uid
morten-spiegel Sep 7, 2020
4887eb1
merge
morten-spiegel Sep 7, 2020
32be0e9
working
morten-spiegel Sep 8, 2020
aa25ccb
testing between -volume and -mount
morten-spiegel Sep 11, 2020
5e01ebf
changed user command in templates
morten-spiegel Oct 22, 2020
64be89c
versions ini
morten-spiegel Oct 26, 2020
587f349
merge
morten-spiegel Oct 26, 2020
037b06c
right port
morten-spiegel Nov 25, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions migrate_non_root.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash

# if [[ ! -z $(docker ps -q) ]]; then
# exit 1
# fi

mkdir -p /opt/node/volumes/liquid/core/var
mkdir -p /opt/node/volumes/snoop/blobs

chown -R 666:666 /opt/node/volumes/liquid/core/var
chown -R 666:666 /opt/node/volumes/snoop/blobs
1 change: 1 addition & 0 deletions templates/authdemo.nomad
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ job "authdemo" {
group "demo" {
task "app" {
driver = "docker"
user = 666
config {
image = "${config.image('liquid-authproxy')}"
args = ["./testapp.py"]
Expand Down
1 change: 1 addition & 0 deletions templates/hoover-workers.nomad
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ job "hoover-workers" {
}

driver = "docker"
# user = 666
config {
image = "${config.image('hoover-snoop2')}"
args = ["sh", "/local/startup.sh"]
Expand Down
10 changes: 7 additions & 3 deletions templates/hoover.nomad
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ job "hoover" {
}

driver = "docker"

#user = 666
config {
image = "${config.image('hoover-search')}"
args = ["sh", "/local/startup.sh"]
Expand Down Expand Up @@ -148,6 +148,7 @@ job "hoover" {
${ task_logs() }

driver = "docker"
# user = 666
config {
image = "${config.image('hoover-snoop2')}"
args = ["sh", "/local/startup.sh"]
Expand Down Expand Up @@ -241,6 +242,7 @@ job "hoover" {
${ task_logs() }

driver = "docker"
# user = 666
config {
image = "${config.image('hoover-snoop2')}"
args = ["sh", "/local/startup.sh"]
Expand Down Expand Up @@ -322,6 +324,7 @@ job "hoover" {
}

driver = "docker"
# user = 666
config {
image = "${config.image('hoover-snoop2')}"
args = ["sh", "/local/startup.sh"]
Expand All @@ -331,7 +334,8 @@ job "hoover" {
"{% raw %}${meta.liquid_volumes}{% endraw %}/snoop/blobs:/opt/hoover/snoop/blobs",
]
port_map {
http = 80
http = 8080
# http = 80
}
labels {
liquid_task = "snoop-api"
Expand All @@ -357,7 +361,7 @@ job "hoover" {
./manage.py healthcheck
date
if [[ "$DEBUG" == "true" ]]; then
exec ./manage.py runserver 0.0.0.0:80
exec ./manage.py runserver 0.0.0.0:8080
else
exec /runserver
fi
Expand Down
22 changes: 22 additions & 0 deletions templates/liquid.nomad
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,34 @@ job "liquid" {
}

driver = "docker"
# user = 666
config {
image = "${config.image('liquid-core')}"
# args = ["/bin/sleep", "1000"]
volumes = [
${liquidinvestigations_core_repo}
"{% raw %}${meta.liquid_volumes}{% endraw %}/liquid/core/var:/app/var",
]
#mounts = [
#{
# type = "volume"
# target = "/app/var"
# source = "{% raw %}${meta.liquid_volumes}{% endraw %}/liquid/core/var"
# # source = "test_core"
# readonly = false
#}
#]
#mounts = [
#{
# type = "bind"
# target = "/app/var"
# source = ${liquidinvestigations_core_repo}"{% raw %}${meta.liquid_volumes}{% endraw %}/liquid/core/var"
# readonly = false
# bind_options {
# propagation = "rshared"
# }
#}
#]
labels {
liquid_task = "liquid-core"
}
Expand Down
3 changes: 3 additions & 0 deletions versions.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
codimd = liquidinvestigations/codimd-server:0.2.1
h-client = liquidinvestigations/h-client:0.1.1
hoover-search = liquidinvestigations/hoover-search:0.6.0
# hoover-search = liquidinvestigations/hoover-search:non-root-user-v1
#hoover-snoop2 = liquidinvestigations/hoover-snoop2:file-model-view
hoover-snoop2 = liquidinvestigations/hoover-snoop2:0.11.2
# hoover-snoop2 = liquidinvestigations/hoover-snoop2:non-root-user-v1
#hoover-ui = liquidinvestigations/hoover-ui:enable-tree-view-update
hoover-ui = liquidinvestigations/hoover-ui:0.3.0
hypothesis-h = liquidinvestigations/hypothesis-h:0.2.1
liquid-authproxy = liquidinvestigations/oauth-proxy:0.0.2
liquid-core = liquidinvestigations/core:0.4.1
# liquid-core = liquidinvestigations/core:non-root-user-v1
liquid-dokuwiki = liquidinvestigations/liquid-dokuwiki:0.1.0
liquid-nextcloud = liquidinvestigations/liquid-nextcloud:0.2.3