From 19b971f21f62e5f173488204110bd787c1264263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C8=98tefan=20D=2E=20Mih=C4=83il=C4=83?=
 <stefan.mihaila@pm.me>
Date: Tue, 13 Aug 2019 22:57:59 +0200
Subject: [PATCH] Rename nginx certificate files

---
 modules/electrs.nix         |  4 ++--
 network/network.nix         | 10 +++++-----
 secrets/generate_secrets.sh |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/electrs.nix b/modules/electrs.nix
index 810d815..b29ae3c 100644
--- a/modules/electrs.nix
+++ b/modules/electrs.nix
@@ -106,8 +106,8 @@ in {
             listen ${toString config.services.electrs.nginxport} ssl;
             proxy_pass electrs;
 
-            ssl_certificate /secrets/ssl_certificate;
-            ssl_certificate_key /secrets/ssl_certificate_key;
+            ssl_certificate /secrets/nginx_cert;
+            ssl_certificate_key /secrets/nginx_key;
             ssl_session_cache shared:SSL:1m;
             ssl_session_timeout 4h;
             ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
diff --git a/network/network.nix b/network/network.nix
index 4059e40..8195f5b 100644
--- a/network/network.nix
+++ b/network/network.nix
@@ -36,15 +36,15 @@ let
     group = "clightning";
     permissions = "0440";
   };
-  ssl_certificate_key = {
-    keyFile = ../secrets/ssl_certificate_key.key;
+  nginx_key = {
+    keyFile = ../secrets/nginx.key;
     destDir = "/secrets/";
     user = "nginx";
     group = "root";
     permissions = "0440";
   };
-  ssl_certificate = {
-    keyFile = ../secrets/ssl_certificate.crt;
+  nginx_cert = {
+    keyFile = ../secrets/nginx.cert;
     destDir = "/secrets/";
     user = "nginx";
     group = "root";
@@ -65,6 +65,6 @@ in {
       // (if (config.services.nanopos.enable) then { inherit lightning-charge-api-token-for-nanopos; } else { })
       // (if (config.services.liquidd.enable) then { inherit liquid-rpcpassword; } else { })
       // (if (config.services.spark-wallet.enable) then { inherit spark-wallet-login; } else { })
-      // (if (config.services.electrs.enable) then { inherit ssl_certificate_key ssl_certificate; } else { });
+      // (if (config.services.electrs.enable) then { inherit nginx_key nginx_cert; } else { });
     } // (bitcoin-node { inherit config pkgs; });
 }
diff --git a/secrets/generate_secrets.sh b/secrets/generate_secrets.sh
index 460de78..c983aeb 100755
--- a/secrets/generate_secrets.sh
+++ b/secrets/generate_secrets.sh
@@ -19,7 +19,7 @@ echo Write secrets to $SECRETSFILE
 echo Done
 
 echo Generate Self-Signed Cert
-openssl genrsa -out secrets/ssl_certificate_key.key 2048
-openssl req -new -key secrets/ssl_certificate_key.key -out secrets/ssl_certificate.csr -subj "/C=KN"
-openssl x509 -req -days 1825 -in secrets/ssl_certificate.csr -signkey secrets/ssl_certificate_key.key -out secrets/ssl_certificate.crt
+openssl genrsa -out secrets/nginx.key 2048
+openssl req -new -key secrets/nginx.key -out secrets/nginx.csr -subj "/C=KN"
+openssl x509 -req -days 1825 -in secrets/nginx.csr -signkey secrets/nginx.key -out secrets/nginx.cert
 echo Done