Nebucatnetzer
/
network_inventory
mirror of https://github.com/Nebucatnetzer/network_inventory.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Replace overmind with process-compose

This commit is contained in:
Andreas Zweili 2023-11-14 15:58:31 +01:00
parent 2e9cb61249
commit 58e6768253
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Procfile
View File

@ -1 +0,0 @@
web: devenv up

4
dev.sh
View File

@ -8,7 +8,6 @@ _init() {
# Setup the database # Setup the database
_setup() { _setup() {
overmind start -D
sleep 5 sleep 5
if [ -f .direnv/first_run ]; then if [ -f .direnv/first_run ]; then
python ./src/manage.py collectstatic --noinput python ./src/manage.py collectstatic --noinput
@ -67,7 +66,6 @@ run() {
sudo iptables -I INPUT -p tcp --dport $WEBPORT -j ACCEPT sudo iptables -I INPUT -p tcp --dport $WEBPORT -j ACCEPT
printf "\n---\n webserver: $url\n---\n" printf "\n---\n webserver: $url\n---\n"
_open_url $url _open_url $url
overmind echo
} }
descriptions["run"]="Start the webserver." descriptions["run"]="Start the webserver."
tasks["run"]=run tasks["run"]=run
@ -75,7 +73,7 @@ descriptions["start"]="Alias for run."
tasks["start"]=run tasks["start"]=run
stop() { stop() {
overmind quit process-compose down
} }
descriptions["stop"]="Stop the webserver and DB." descriptions["stop"]="Stop the webserver and DB."
tasks["stop"]=stop tasks["stop"]=stop

9
flake.nix
View File

@ -29,7 +29,6 @@
modules = [ modules = [
{ {
packages = [ packages = [
pkgs.overmind
(pkgs.writeScriptBin "dev" "${builtins.readFile ./dev.sh}") (pkgs.writeScriptBin "dev" "${builtins.readFile ./dev.sh}")
]; ];
env = { env = {
@ -45,7 +44,13 @@
install.enable = true; install.enable = true;
}; };
}; };
processes.webserver.exec = "poetry run python ./src/manage.py runserver 0.0.0.0:$WEBPORT"; process.implementation = "process-compose";
process-managers.process-compose.enable = true;
# https://github.com/cachix/devenv/blob/main/examples/process-compose/devenv.nix
processes = {
webserver.exec = "poetry run python ./src/manage.py runserver 0.0.0.0:$WEBPORT";
setup.exec = "dev start";
};
services.postgres = { services.postgres = {
enable = true; enable = true;
initialDatabases = [{ name = "django"; }]; initialDatabases = [{ name = "django"; }];