fix

4 files changed, 29 insertions, 105 deletions

diff --git a/spectralrenga.conf b/spectralrenga.conf
new file mode 100644
index 0000000..95875ba
--- /dev/null
+++ b/spectralrenga.conf
@@ -0,0 +1,21 @@
+server {
+    server_name spectralrenga.cyfraeviolae.org;
+    location / {
+        proxy_pass http://127.0.0.1:8080;
+    }
+
+    listen 443 ssl; # managed by Certbot
+    ssl_certificate /etc/letsencrypt/live/spectralrenga.cyfraeviolae.org/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/spectralrenga.cyfraeviolae.org/privkey.pem;
+    include /etc/letsencrypt/options-ssl-nginx.conf;
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+}
+
+server {
+    if ($host = spectralrenga.cyfraeviolae.org) {
+        return 301 https://$host$request_uri;
+    } # managed by Certbot
+    server_name spectralrenga.cyfraeviolae.org;
+    listen 80;
+    return 404;
+}
diff --git a/spectral-renga.service b/spectralrenga.service
index 391f5f9..391f5f9 100644
--- a/spectral-renga.service
+++ b/spectralrenga.service
diff --git a/stack.yaml b/stack.yaml
index 20647a8..210307b 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -17,8 +17,8 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver:
-  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/23.yaml
+# resolver: lts-17.11
+resolver: nightly-2021-05-16
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
@@ -41,19 +41,7 @@ packages:
 #   commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
 #
 extra-deps:
-  - sqlite-simple-0.4.18.0@sha256:3ceea56375c0a3590c814e411a4eb86943f8d31b93b110ca159c90689b6b39e5,3002
-  - direct-sqlite-2.3.26@sha256:04e835402f1508abca383182023e4e2b9b86297b8533afbd4e57d1a5652e0c23,3718
-  - random-1.2.0@sha256:1e8140229d21489228aa79b820c23259f3c3a1b86e13e6f9c2ad0c48d86d1912,6094
-  - splitmix-0.1.0.3
-  - QuickCheck-2.14.2
-  - servant-0.18.2
-  - servant-lucid-0.9.0.2
-  - servant-server-0.18.2
-  - hlint-2.2.11@sha256:f4eef0d718264824254bf375a85a91a8756b20c4f7d2a4854ffe4e69e8bd1679,4069
-  - stylish-haskell-0.9.4.4@sha256:ea514922e47ea05a924355a841abd26d18101037c46fbb90e201ae83582a8728,4953
-  - ghc-lib-parser-ex-8.8.5.8@sha256:04f164fd6a4a5b0c5627cf7fadd79174c3b1d4c696dc481a9909266bd6a2a6aa,2760
-  - haskell-src-exts-1.22.0@sha256:f558923a9c8f57402c33a8cc871b934027a5c65414404c87239f6cbd7357d54e,4541
-  - ghc-exactprint-0.6.3.3@sha256:384e1066c192ed60dc12443b7aca75a4a4adcc47f829336c21ed007596fe683f,9446
+  - servant-lucid-0.9.0.2@sha256:693278d574dba7313e931200118424762c02682bbc654e8866be4e6d1c73d816,1803
 
 # Override default flag values for local packages and extra-deps
 # flags: {}
diff --git a/stack.yaml.lock b/stack.yaml.lock
index 5ee3cef..59dd3fd 100644
--- a/stack.yaml.lock
+++ b/stack.yaml.lock
@@ -5,100 +5,15 @@
 
 packages:
 - completed:
-    hackage: sqlite-simple-0.4.18.0@sha256:3ceea56375c0a3590c814e411a4eb86943f8d31b93b110ca159c90689b6b39e5,3002
-    pantry-tree:
-      size: 1930
-      sha256: e58b9955e483d51ee0966f8ba4384305d871480e2a38b32ee0fcd4573d74cf95
-  original:
-    hackage: sqlite-simple-0.4.18.0@sha256:3ceea56375c0a3590c814e411a4eb86943f8d31b93b110ca159c90689b6b39e5,3002
-- completed:
-    hackage: direct-sqlite-2.3.26@sha256:04e835402f1508abca383182023e4e2b9b86297b8533afbd4e57d1a5652e0c23,3718
-    pantry-tree:
-      size: 770
-      sha256: 11874ab21e10c5b54cd1e02a037b677dc1e2ee9986f38c599612c56654dc01c3
-  original:
-    hackage: direct-sqlite-2.3.26@sha256:04e835402f1508abca383182023e4e2b9b86297b8533afbd4e57d1a5652e0c23,3718
-- completed:
-    hackage: random-1.2.0@sha256:1e8140229d21489228aa79b820c23259f3c3a1b86e13e6f9c2ad0c48d86d1912,6094
-    pantry-tree:
-      size: 1259
-      sha256: 20fadca2f3ea21eafc87f0d516045a18c19348ef85303f5a5e85662a55975170
-  original:
-    hackage: random-1.2.0@sha256:1e8140229d21489228aa79b820c23259f3c3a1b86e13e6f9c2ad0c48d86d1912,6094
-- completed:
-    hackage: splitmix-0.1.0.3@sha256:fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c,6049
-    pantry-tree:
-      size: 1400
-      sha256: 8290f921f41c3628a6c9871502e57fd1d25f5954967afbf4ed16717fd8d3656f
-  original:
-    hackage: splitmix-0.1.0.3
-- completed:
-    hackage: QuickCheck-2.14.2@sha256:4ce29211223d5e6620ebceba34a3ca9ccf1c10c0cf387d48aea45599222ee5aa,7736
-    pantry-tree:
-      size: 2315
-      sha256: 2fe423d0ed7cd64f0f165d708779f48814e66c4f181c568468134af55d86a5f8
-  original:
-    hackage: QuickCheck-2.14.2
-- completed:
-    hackage: servant-0.18.2@sha256:f8c9f0e9891a3ada1337a3c0b369333a3b5a2d0909dd3cd09d79bc26adeaca44,5298
-    pantry-tree:
-      size: 2662
-      sha256: e930e814de1aa4d24274bdf18341a50b7ed38604ae4734f730e09238ac5bf7e2
-  original:
-    hackage: servant-0.18.2
-- completed:
     hackage: servant-lucid-0.9.0.2@sha256:693278d574dba7313e931200118424762c02682bbc654e8866be4e6d1c73d816,1803
     pantry-tree:
       size: 392
       sha256: c5635bc53887b81087c3430341790d45cd4063340a0baa62bedd2e77ed4aa84d
   original:
-    hackage: servant-lucid-0.9.0.2
-- completed:
-    hackage: servant-server-0.18.2@sha256:56679af62ab8820a2108da6153d9ae9dde37199e62172365bdaea1458c3f7c2d,5482
-    pantry-tree:
-      size: 2614
-      sha256: 3ac7430134439e4b67f0f5333f63b89d0cb7de5e2e07f0af7801c8e223942b9c
-  original:
-    hackage: servant-server-0.18.2
-- completed:
-    hackage: hlint-2.2.11@sha256:f4eef0d718264824254bf375a85a91a8756b20c4f7d2a4854ffe4e69e8bd1679,4069
-    pantry-tree:
-      size: 5014
-      sha256: f75f1e4185337aa32610ec7710d12e5d2b9c79292fa8a08348580861c99c6826
-  original:
-    hackage: hlint-2.2.11@sha256:f4eef0d718264824254bf375a85a91a8756b20c4f7d2a4854ffe4e69e8bd1679,4069
-- completed:
-    hackage: stylish-haskell-0.9.4.4@sha256:ea514922e47ea05a924355a841abd26d18101037c46fbb90e201ae83582a8728,4953
-    pantry-tree:
-      size: 2863
-      sha256: 90316b02f585d82d84f90a393d838e9ae1603fd5c0a01f216459ab56f7dc8cfb
-  original:
-    hackage: stylish-haskell-0.9.4.4@sha256:ea514922e47ea05a924355a841abd26d18101037c46fbb90e201ae83582a8728,4953
-- completed:
-    hackage: ghc-lib-parser-ex-8.8.5.8@sha256:04f164fd6a4a5b0c5627cf7fadd79174c3b1d4c696dc481a9909266bd6a2a6aa,2760
-    pantry-tree:
-      size: 1453
-      sha256: 7b861387a0e0d668b77f1019ed57728d9d3136e489158716fc22077034a0d3d3
-  original:
-    hackage: ghc-lib-parser-ex-8.8.5.8@sha256:04f164fd6a4a5b0c5627cf7fadd79174c3b1d4c696dc481a9909266bd6a2a6aa,2760
-- completed:
-    hackage: haskell-src-exts-1.22.0@sha256:f558923a9c8f57402c33a8cc871b934027a5c65414404c87239f6cbd7357d54e,4541
-    pantry-tree:
-      size: 96940
-      sha256: 597b6f48bd409a4d0da013c4e356945c42e0d098966035d3aa68cd4a3ccd66c9
-  original:
-    hackage: haskell-src-exts-1.22.0@sha256:f558923a9c8f57402c33a8cc871b934027a5c65414404c87239f6cbd7357d54e,4541
-- completed:
-    hackage: ghc-exactprint-0.6.3.3@sha256:384e1066c192ed60dc12443b7aca75a4a4adcc47f829336c21ed007596fe683f,9446
-    pantry-tree:
-      size: 86248
-      sha256: c43b6e600634f5d5df2feb69e27e745fff25fe60503a30d3e5c86428882b686f
-  original:
-    hackage: ghc-exactprint-0.6.3.3@sha256:384e1066c192ed60dc12443b7aca75a4a4adcc47f829336c21ed007596fe683f,9446
+    hackage: servant-lucid-0.9.0.2@sha256:693278d574dba7313e931200118424762c02682bbc654e8866be4e6d1c73d816,1803
 snapshots:
 - completed:
-    size: 532832
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/23.yaml
-    sha256: fbb2a0519008533924c7753bd7164ddd1009f09504eb06674acad6049b46db09
-  original:
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/23.yaml
+    size: 584751
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2021/5/16.yaml
+    sha256: 36042502992a33fd7313e8bbfdf9cb347a04c438dc79c2e6c6c19bbbcf1f5a36
+  original: nightly-2021-05-16