From 987393942b9acc10e743c60b264f08dc203877bb Mon Sep 17 00:00:00 2001
From: Matthias Stecher <matthiasstecher@gmx.de>
Date: Sat, 22 Aug 2020 15:53:24 +0200
Subject: [PATCH] __netbox: add more database parameters

---
 type/__netbox/files/configuration.py.sh       | 4 ++--
 type/__netbox/man.rst                         | 9 +++++++++
 type/__netbox/manifest                        | 7 +++++++
 type/__netbox/parameter/default/database-host | 1 +
 type/__netbox/parameter/default/database-port | 1 +
 type/__netbox/parameter/optional              | 2 ++
 type/__netbox/parameter/required              | 1 +
 7 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 type/__netbox/parameter/default/database-host
 create mode 100644 type/__netbox/parameter/default/database-port

diff --git a/type/__netbox/files/configuration.py.sh b/type/__netbox/files/configuration.py.sh
index e621845..65b00f5 100755
--- a/type/__netbox/files/configuration.py.sh
+++ b/type/__netbox/files/configuration.py.sh
@@ -19,8 +19,8 @@ DATABASE = {
     'NAME': '$DATABASE_NAME', # Database name
     'USER': '$DATABASE_USER', # PostgreSQL username
     'PASSWORD': '$DATABASE_PASSWORD', # PostgreSQL password
-    'HOST': 'localhost',      # Database server
-    'PORT': '',               # Database port (leave blank for default)
+    'HOST': '$DATABASE_HOST', # Database server
+    'PORT': '$DATABASE_PORT', # Database port (leave blank for default)
     'CONN_MAX_AGE': 300,      # Max database connection age
 }
 
diff --git a/type/__netbox/man.rst b/type/__netbox/man.rst
index d91c6e8..a09b13a 100644
--- a/type/__netbox/man.rst
+++ b/type/__netbox/man.rst
@@ -26,6 +26,9 @@ version
 database
     PostgreSQL database name.
 
+database-user
+    PostgreSQL database user.
+
 database-password
     PostgreSQL database password.
 
@@ -39,6 +42,12 @@ host
 
 OPTIONAL PARAMETERS
 -------------------
+database-host
+  PostgreSQL database hostname. Defaults to ``localhost``.
+
+database-port
+  PostgreSQL database port. Defaults to empty (uses the default port).
+
 ldap-server
   LDAP server URI. Enables LDAP-backed authentication if specified.
 
diff --git a/type/__netbox/manifest b/type/__netbox/manifest
index 1f7f8ed..45c8afc 100755
--- a/type/__netbox/manifest
+++ b/type/__netbox/manifest
@@ -26,8 +26,15 @@ esac
 
 DATABASE_NAME=$(cat "$__object/parameter/database")
 export DATABASE_NAME
+DATABASE_USER="$(cat "$__object/parameter/database-user")"
+export DATABASE_USER
 DATABASE_PASSWORD=$(cat "$__object/parameter/database-password")
 export DATABASE_PASSWORD
+DATABASE_HOST="$(cat "$__object/parameter/database-host")"
+export DATABASE_HOST
+DATABASE_PORT="$(cat "$__object/parameter/database-port")"
+export DATABASE_PORT
+
 ALLOWED_HOST=$(cat "$__object/parameter/host")
 export ALLOWED_HOST
 SECRET_KEY=$(cat "$__object/parameter/secret-key")
diff --git a/type/__netbox/parameter/default/database-host b/type/__netbox/parameter/default/database-host
new file mode 100644
index 0000000..2fbb50c
--- /dev/null
+++ b/type/__netbox/parameter/default/database-host
@@ -0,0 +1 @@
+localhost
diff --git a/type/__netbox/parameter/default/database-port b/type/__netbox/parameter/default/database-port
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/type/__netbox/parameter/default/database-port
@@ -0,0 +1 @@
+
diff --git a/type/__netbox/parameter/optional b/type/__netbox/parameter/optional
index 159c813..d97f961 100644
--- a/type/__netbox/parameter/optional
+++ b/type/__netbox/parameter/optional
@@ -1,3 +1,5 @@
+database-host
+database-port
 ldap-server
 ldap-bind-dn
 ldap-bind-password
diff --git a/type/__netbox/parameter/required b/type/__netbox/parameter/required
index 388048a..84e8e4b 100644
--- a/type/__netbox/parameter/required
+++ b/type/__netbox/parameter/required
@@ -1,5 +1,6 @@
 version
 database
+database-user
 database-password
 secret-key
 host