Moves app-specific configuration to mmelodies project.

README.md

@@ -1,21 +0,0 @@
-## Using selfsigned SSL Keys for a PWA on Android
-
-Generate selfsigned ssl keys with:
-```
-HOSTNAME=melodypond
-openssl genrsa -out ssl/snakeoil.key
-openssl x509 -new -key ss/snakeoil.key -out ssl/snakeoil.crt -subj "/CN=$HOSTNAME" -extfile ssl/options.txt
-# Then manually copy the key and certificate to /etc/ssl on the server.
-#   and onto the Android device used as the controller.
-```
-
-These keys can then be added to the Android device used as the controller by going to
-`Settings >> Security >> Credentials >> Install >> CA` then selecting the certificate
-and rebooting the device.
-
-If you are using a Firefox-based browser on the phone, you will also need to enable third party certificates
-in the Firefox app's developer settings.
-This can be accessed by tapping the logo on the about screen many times, then going to
-`Settings >> Secret Settings >> Use Third Party CAs`
-
-Firefox should now show the site as secure and allow installing the PWA.

configuration.nix

@@ -1,8 +1,5 @@
 {pkgs, ... }:
 {
-  imports = [
-    ./melodies.nix
-  ];
   system.stateVersion = "23.05";
 
   # Enables flakes and the updated `nix` command

flake.lock

@@ -112,11 +112,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696044784,
-        "narHash": "sha256-QsWuIAuxKXEa4DMtMz/VAcTVlzQ9UG6GVDGwhEYNUHE=",
+        "lastModified": 1696095079,
+        "narHash": "sha256-qpGjVk6HObvXcJsp1qAcsFdeeMoiUgBdWeS9HtW6FGs=",
         "ref": "refs/heads/main",
-        "rev": "7e4006d3c198adcaa7a193755564e9d33b077719",
-        "revCount": 17,
+        "rev": "ac81a158b5dd86ef75e610b19e5f06496b7412c7",
+        "revCount": 21,
         "type": "git",
         "url": "https://fem.mint.lgbt/theotheroracle/andisco.git"
       },

flake.nix

@@ -55,8 +55,8 @@
       };
       # Modules for colmena and sd card image are the same.
       modules = (builtins.attrValues self.nixosModules) ++ [
-          ./platforms/melodypond.nix
-          inputs.nixos-hardware.nixosModules.raspberry-pi-4
+        ./platforms/melodypond.nix
+        inputs.nixos-hardware.nixosModules.raspberry-pi-4
       ];
     in {
       nixosModules = {
@@ -66,6 +66,7 @@
             nixconf.flake = self;
           };
         };
+        mmelodies = inputs.mmelodies.nixosModules.default;
         default = import ./configuration.nix;
       };
       # Colmena deploy manifest

melodies.nix

@@ -1,12 +0,0 @@
-{pkgs, config, ...}:
-{
-  services.nginx.enable = true;
-
-  services.nginx.virtualHosts."${config.networking.hostName}" = {
-    addSSL = true;
-    sslCertificate = "/etc/ssl/snakeoil.crt";
-    sslCertificateKey = "/etc/ssl/snakeoil.key";
-    root = pkgs.mmelodies.frontend;
-  };
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
-}