update docs; remove livecertificate from cfg

diffusionkinetics · Nov 18, 2017 · 335880e · 335880e
1 parent 1b3eadd
commit 335880e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/dampf/.dampfcfg.yaml.example b/dampf/.dampfcfg.yaml.example
@@ -1,12 +1,10 @@
 # a file such as the below should me placed in $HOME/.dampfcfg.yaml
 
-liveCertificate: /etc/letsencrypt/live/mydomain.com/
-
 postgres:
     host: localhost
     port: 5432
 
     users:
         postgres: pgpassword
-        user: password
+        user: userspassword
 
diff --git a/dampf/README.md b/dampf/README.md
@@ -193,8 +193,6 @@ This file should *not* be checked into version control as it contains secrets th
 Syntax:
 
 ```
-liveCertificate: {part to Let's encrypt certificate file}
-
 postgres:
     host: {host address or name}
     port: {port number}
@@ -242,6 +240,12 @@ Syntax: `dampf monitor {test name}`
 Run specified test (if non specified, run all tests except those only marked
 "AtBuild") against the live production environment.
 
+### `test` command
+
+Syntax: `dampf test {test name}`
+
+Run specified test (if non specified, run all tests) in a synthetic environment.
+
 Status: Not implemented
 
 ## Environment variables and host names

diff --git a/dampf/lib/Dampf/ConfigFile/Pretty.hs b/dampf/lib/Dampf/ConfigFile/Pretty.hs
@@ -16,11 +16,9 @@ pShowDampfConfig = render . hang (text "Config File:") 4 . pprDampfConfig
 
 pprDampfConfig :: DampfConfig -> Doc
 pprDampfConfig cfg = vcat
-    [ pprLiveCertificate l
-    , pprDatabaseServer d
+    [ pprDatabaseServer d
     ]
   where
-    l = cfg ^. liveCertificate
     d = cfg ^. postgres
 
 

diff --git a/dampf/lib/Dampf/ConfigFile/Types.hs b/dampf/lib/Dampf/ConfigFile/Types.hs
@@ -42,8 +42,7 @@ instance FromJSON PostgresConfig where
 
 
 data DampfConfig = DC
-    { _liveCertificate  :: Maybe FilePath
-    , _postgres         :: Maybe PostgresConfig
+    { _postgres         :: Maybe PostgresConfig
     } deriving (Eq, Show, Generic)
 
 makeClassy ''DampfConfig