replaced external ip with external name

diff --git a/README.md b/README.md
index 81706611f0d20689d43ae8e10e1e09f4b9ffcd62..985c6d290ed0ccf56f1a6848f47ffb42ecb521ca 100644 (file)
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ project/
 ```dotenv
 # --- Host & Web ---
 DOMAIN=example.com
-PUBLIC_IP=127.0.0.1
+EXTERNAL_NAME=dyndns.example.com
 HTTP_PORT=8000
 # --- Admin ---
 ADMIN_USER=admin
@@ -100,7 +100,7 @@ services:
       LOG_ACCESS_FILE: "/data/access.log"
       # Host
       DOMAIN: "${DOMAIN:-example.com}"
-      PUBLIC_IP: "${PUBLIC_IP:-127.0.0.1}"
+      EXTERNAL_NAME: "${EXTERNAL_NAME:-dyndns.example.com}"
       # Web
       HTTP_PORT: "${HTTP_PORT:-8000}"
       LOGIN_MAX_ATTEMPTS: "${LOGIN_MAX_ATTEMPTS:-5}"
@@ -135,7 +135,7 @@ secrets:
 | `LOG_FILE` | app.log | Application log file |
 | `LOG_ACCESS_FILE` | access.log | HTTP access log |
 | `DOMAIN` | example.com | Public domain |
-| `PUBLIC_IP` | 127.0.0.1 | Public IP |
+| `EXTERNAL_NAME` | dyndns.example.com | External Name |
 | `HTTP_PORT` | 8000 | Internal HTTP port |
 | `LOGIN_MAX_ATTEMPTS` | 5 | Login attempts |
 | `LOGIN_WINDOW_SECONDS` | 600 | Attempt window |

diff --git a/backend/db/hosts.py b/backend/db/hosts.py
index 7b0a639043c59b0eced3abf031aaee2dcd4526cd..7a5ad05172064cb95ccab6983c1ea2d25c5187df 100644 (file)
--- a/backend/db/hosts.py
+++ b/backend/db/hosts.py
@@ -197,7 +197,7 @@ def init_db_hosts_table(cur):
         );
     """)
     cur.execute("INSERT INTO settings (key, value) VALUES (?, ?)", ("domain", settings.DOMAIN))
-    cur.execute("INSERT INTO settings (key, value) VALUES (?, ?)", ("external_ipv4", settings.PUBLIC_IP))
+    cur.execute("INSERT INTO settings (key, value) VALUES (?, ?)", ("external_name", settings.EXTERNAL_NAME))
 
     # HOSTS TABLE
     cur.execute("""
@@ -227,4 +227,4 @@ def init_db_hosts_table(cur):
     cur.execute("CREATE INDEX idx_txt_host ON txt_records(host_id);")
 
     logger.info("HOSTS DB: Database initialized successfully for %s", settings.DOMAIN)
-    logger.info("HOSTS DB: Public IP: %s", settings.PUBLIC_IP)
+    logger.info("HOSTS DB: Public IP: %s", settings.EXTERNAL_NAME)

diff --git a/entrypoint.py b/entrypoint.py
index 29ec408072e3e75376a0b0b708f373496a037035..4a99c659f0258c51d1b52dc261ec39464dea1665 100755 (executable)
--- a/entrypoint.py
+++ b/entrypoint.py
@@ -22,7 +22,7 @@ def parse_args():
     parser = argparse.ArgumentParser(add_help=False)
     parser.add_argument("--reset", action="store_true")
     parser.add_argument("--domain")
-    parser.add_argument("--public-ip")
+    parser.add_argument("--external-name")
     parser.add_argument("cmd", nargs=argparse.REMAINDER)
     return parser.parse_args()
 
@@ -67,8 +67,8 @@ def main():
         settings.DB_RESET = True
     if args.domain:
         settings.DOMAIN = args.domain
-    if args.public_ip:
-        settings.PUBLIC_IP = args.public_ip
+    if args.external_name:
+        settings.EXTERNAL_NAME = args.EXTERNAL_NAME
 
     # Create or update database
     docker_create_db(logger)

diff --git a/settings/default.py b/settings/default.py
index 7b013b4c8432c3d19d674cdb232583093254dd4a..29af16f8cf3988117760568510bcdb4971efc24c 100644 (file)
--- a/settings/default.py
+++ b/settings/default.py
@@ -28,7 +28,7 @@ LOG_ACCESS_FILE = "access.log"
 # Host
 # ---------------------------------------------------------
 DOMAIN = "example.com"
-PUBLIC_IP = "127.0.0.1"
+EXTERNAL_NAME = "dyndns.example.com"
 
 # ---------------------------------------------------------
 # Web

diff --git a/settings/settings.py b/settings/settings.py
index af8c5c2e262ca4a35752bed3ff0e595703fd7e5a..d7caf576bd4d512bf880532b616d28ac8d40b63d 100644 (file)
--- a/settings/settings.py
+++ b/settings/settings.py
@@ -69,7 +69,7 @@ class Settings(BaseModel):
 
     # Hosts
     DOMAIN: str = Field(default_factory=lambda: os.getenv("DOMAIN", default.DOMAIN))
-    PUBLIC_IP: str = Field(default_factory=lambda: os.getenv("PUBLIC_IP", default.DOMAIN))
+    EXTERNAL_NAME: str = Field(default_factory=lambda: os.getenv("EXTERNAL_NAME", default.DOMAIN))
 
     # Web
     HTTP_PORT: int = Field(default_factory=lambda: int(os.getenv("HTTP_PORT", default.HTTP_PORT)))