From 4a186854cf0dc7730662eb1abdc30be61707e00c Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Sun, 26 Apr 2020 00:34:55 +0200 Subject: [PATCH] server/node: Renamed variable app_port to bind_port --- playbooks/host_nvak.banananet.work.yml | 4 ++-- playbooks/host_rurapenthe.banananet.work.yml | 2 +- roles/server/node/defaults/main.yml | 2 +- roles/server/node/meta/main.yml | 2 +- roles/server/node/templates/node.service | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/playbooks/host_nvak.banananet.work.yml b/playbooks/host_nvak.banananet.work.yml index 1a17417..cefc744 100644 --- a/playbooks/host_nvak.banananet.work.yml +++ b/playbooks/host_nvak.banananet.work.yml @@ -25,7 +25,7 @@ # - role: server/node # domain: keys.banananet.work # repo: git@git.banananet.work:banananetwork/keys.git -# app_port: 12822 +# bind_port: 12822 # system_user: keys-banananet-work # Nextcloud Server - role: server/nextcloud @@ -118,7 +118,7 @@ # - role: server/node # domain: dsa.banananet.work # repo: git@git.banananet.work:dsaGroup/dsaPage.git -# app_port: 12821 +# bind_port: 12821 # system_user: dsaPage # Forum der Schande - role: server/php diff --git a/playbooks/host_rurapenthe.banananet.work.yml b/playbooks/host_rurapenthe.banananet.work.yml index 9b1a72c..d1b8e98 100644 --- a/playbooks/host_rurapenthe.banananet.work.yml +++ b/playbooks/host_rurapenthe.banananet.work.yml @@ -20,7 +20,7 @@ - role: server/node domain: keys.banananet.work repo: git@git.banananet.work:banananetwork/keys.git - app_port: 12822 + bind_port: 12822 system_user: keys-banananet-work environment_vars: REGISTER_PASS: "{{ global_ip_discover_register_pass }}" diff --git a/roles/server/node/defaults/main.yml b/roles/server/node/defaults/main.yml index 2150c7f..87da4ed 100644 --- a/roles/server/node/defaults/main.yml +++ b/roles/server/node/defaults/main.yml @@ -4,7 +4,7 @@ service_name: "{{ domain }}.service" # TODO Socket -# app_port +# bind_port # repo # system_user: "nodejs" diff --git a/roles/server/node/meta/main.yml b/roles/server/node/meta/main.yml index 198a992..22c648b 100644 --- a/roles/server/node/meta/main.yml +++ b/roles/server/node/meta/main.yml @@ -18,4 +18,4 @@ dependencies: # reload_command - role: nginx/proxy # domain - backend_port: "{{ app_port }}" + backend_port: "{{ bind_port }}" diff --git a/roles/server/node/templates/node.service b/roles/server/node/templates/node.service index 2c90971..66ea033 100644 --- a/roles/server/node/templates/node.service +++ b/roles/server/node/templates/node.service @@ -14,7 +14,7 @@ ExecStart=/usr/bin/npm start Environment="USER={{ system_user }}" Environment="HOME={{ user_directory }}" Environment="NODE_ENV=production" -Environment="PORT={{ app_port }}" +Environment="PORT={{ bind_port }}" Environment="DOMAIN={{ domain }}" Environment="DATABASE_HOST=127.0.0.1" Environment="DATABASE_PORT=3306"