Rename *.esPort for consistency

barrucadu · Oct 15, 2023 · 4b18a04 · 4b18a04
1 parent ffc6136
commit 4b18a04
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/shared/bookdb/default.nix b/shared/bookdb/default.nix
@@ -41,7 +41,7 @@ in
         "ALLOW_WRITES" = if cfg.readOnly then "0" else "1";
         "BASE_URI" = cfg.baseURI;
         "COVER_DIR" = "${cfg.dataDir}/covers";
-        "ES_HOST" = "http://127.0.0.1:${toString cfg.esPort}";
+        "ES_HOST" = "http://127.0.0.1:${toString cfg.elasticsearchPort}";
         "UUIDS_FILE" = ./uuids.yaml;
       };
     };
@@ -54,7 +54,7 @@ in
         "xpack.security.enabled" = "false";
         "ES_JAVA_OPTS" = "-Xms512M -Xmx512M";
       };
-      ports = [{ host = cfg.esPort; inner = 9200; }];
+      ports = [{ host = cfg.elasticsearchPort; inner = 9200; }];
       volumes = [{ name = "esdata"; inner = "/usr/share/elasticsearch/data"; }];
       volumeSubDir = "bookdb";
     };

diff --git a/shared/bookdb/options.nix b/shared/bookdb/options.nix
@@ -20,7 +20,7 @@ with lib;
       '';
     };
 
-    esPort = mkOption {
+    elasticsearchPort = mkOption {
       type = types.int;
       default = 47164;
       description = mdDoc ''

diff --git a/shared/bookmarks/default.nix b/shared/bookmarks/default.nix
@@ -37,7 +37,7 @@ in
       environment = {
         ALLOW_WRITES = if cfg.readOnly then "0" else "1";
         BASE_URI = cfg.baseURI;
-        ES_HOST = "http://127.0.0.1:${toString cfg.esPort}";
+        ES_HOST = "http://127.0.0.1:${toString cfg.elasticsearchPort}";
       };
     };
 
@@ -49,13 +49,13 @@ in
         "xpack.security.enabled" = "false";
         "ES_JAVA_OPTS" = "-Xms512M -Xmx512M";
       };
-      ports = [{ host = cfg.esPort; inner = 9200; }];
+      ports = [{ host = cfg.elasticsearchPort; inner = 9200; }];
       volumes = [{ name = "esdata"; inner = "/usr/share/elasticsearch/data"; }];
       volumeSubDir = "bookmarks";
     };
 
     nixfiles.backups.scripts.bookmarks = ''
-      env ES_HOST=http://127.0.0.1:${toString cfg.esPort} ${pkgs.nixfiles.bookmarks}/bin/python -m bookmarks.index.dump | gzip -9 > dump.json.gz
+      env ES_HOST=http://127.0.0.1:${toString cfg.elasticsearchPort} ${pkgs.nixfiles.bookmarks}/bin/python -m bookmarks.index.dump | gzip -9 > dump.json.gz
     '';
   };
 }
diff --git a/shared/bookmarks/options.nix b/shared/bookmarks/options.nix
@@ -20,7 +20,7 @@ with lib;
       '';
     };
 
-    esPort = mkOption {
+    elasticsearchPort = mkOption {
       type = types.int;
       default = 43389;
       description = mdDoc ''