App-level Config / code style

config.json now controls encryption and salt for both passwords and
forms authentication; data-config.json options are now under the "data"
key in config.json.

Unaligned ->'s throughout code per F# design guidelines, pulled out some
longer lambdas into their own let bindings within the method/function
scope, added qualified access attributes to smaller constant-type
modules

src/myWebLog.Data/DataConfig.fs

@@ -25,8 +25,8 @@ type DataConfig =
     [<JsonIgnore>]
     Conn : IConnection }
 with
-  /// Create a data configuration from JSON
+  /// Use RethinkDB defaults for non-provided options, and connect to the server
-  static member FromJson json =
+  static member Connect config =
     let ensureHostname cfg = match cfg.Hostname with 
                              | null -> { cfg with Hostname = RethinkDBConstants.DefaultHostname }
                              | _ -> cfg
@@ -49,11 +49,10 @@ with
                                                  .Db(cfg.Database)
                                                  .Timeout(cfg.Timeout)
                                                  .Connect() }
-    JsonConvert.DeserializeObject<DataConfig> json
+    config
     |> ensureHostname
     |> ensurePort
     |> ensureAuthKey
     |> ensureTimeout
     |> ensureDatabase
     |> connect
-    

src/myWebLog.Data/Entities.fs

@@ -5,6 +5,7 @@ open Newtonsoft.Json
 // ---- Constants ----
 
 /// Constants to use for revision source language
+[<RequireQualifiedAccess>]
 module RevisionSource =
   [<Literal>]
   let Markdown = "markdown"
@@ -12,6 +13,7 @@ module RevisionSource =
   let HTML = "html"
 
 /// Constants to use for authorization levels
+[<RequireQualifiedAccess>]
 module AuthorizationLevel =
   [<Literal>]
   let Administrator = "Administrator"
@@ -19,6 +21,7 @@ module AuthorizationLevel =
   let User = "User"
 
 /// Constants to use for post statuses
+[<RequireQualifiedAccess>]
 module PostStatus =
   [<Literal>]
   let Draft = "Draft"
@@ -26,6 +29,7 @@ module PostStatus =
   let Published = "Published"
 
 /// Constants to use for comment statuses
+[<RequireQualifiedAccess>]
 module CommentStatus =
   [<Literal>]
   let Approved = "Approved"
@@ -84,7 +88,7 @@ with
       UpdatedOn      = int64 0
       ShowInPageList = false
       Text           = ""
-      Revisions      = List.empty
+      Revisions      = []
     }
 
 
@@ -121,7 +125,7 @@ with
       ThemePath   = "default"
       UrlBase     = ""
       TimeZone    = "America/New_York"
-      PageList    = List.empty }
+      PageList    = [] }
 
 
 /// An authorization between a user and a web log
@@ -160,7 +164,7 @@ with
       PreferredName  = ""
       PasswordHash   = ""
       Url            = None
-      Authorizations = List.empty }
+      Authorizations = [] }
   
   /// Claims for this user
   [<JsonIgnore>]
@@ -186,14 +190,14 @@ type Category =
     Children : string list }
 with
   /// An empty category
-  static member empty =
+  static member Empty =
     { Id          = "new"
       WebLogId    = ""
       Name        = ""
       Slug        = ""
       Description = None
       ParentId    = None
-      Children    = List.empty }
+      Children    = [] }
 
 
 /// A comment (applies to a post)
@@ -272,9 +276,9 @@ with
       PublishedOn     = int64 0
       UpdatedOn       = int64 0
       Text            = ""
-      CategoryIds     = List.empty
+      CategoryIds     = []
-      Tags            = List.empty
+      Tags            = []
-      PriorPermalinks = List.empty
+      PriorPermalinks = []
-      Revisions       = List.empty
+      Revisions       = []
-      Categories      = List.empty
+      Categories      = []
-      Comments        = List.empty }
+      Comments        = [] }

src/myWebLog.Data/Page.fs

@@ -21,9 +21,7 @@ let tryFindPage conn webLogId pageId =
           .RunAtomAsync<Page>(conn) |> await |> box with
   | null -> None
   | page -> let pg : Page = unbox page
-            match pg.WebLogId = webLogId with
+            match pg.WebLogId = webLogId with true -> Some pg | _ -> None
-            | true -> Some pg
-            | _    -> None
 
 /// Get a page by its Id (excluding revisions)
 let tryFindPageWithoutRevisions conn webLogId pageId : Page option =

src/myWebLog.Data/Post.fs

@@ -101,8 +101,6 @@ let tryFindPost conn webLogId postId : Post option =
   | post -> Some <| unbox post
 
 /// Try to find a post by its permalink
-// TODO: see if we can make .Merge work for page list even though the attribute is ignored
-//       (needs to be ignored for serialization, but included for deserialization)
 let tryFindPostByPermalink conn webLogId permalink =
   r.Table(Table.Post)
     .GetAll(r.Array(webLogId, permalink)).OptArg("index", "Permalink")
@@ -159,8 +157,8 @@ let savePost conn post =
              newPost.Id
   | _ -> r.Table(Table.Post)
            .Get(post.Id)
-               .Replace( { post with Categories = List.empty
+           .Replace( { post with Categories = []
-                                     Comments   = List.empty } )
+                                 Comments   = [] } )
            .RunResultAsync(conn)
          |> ignore
          post.Id

src/myWebLog.Data/SetUp.fs

@@ -10,7 +10,7 @@ let private logStepStart text = Console.Out.Write     (sprintf "[myWebLog] %s...
 let private logStepDone  ()   = Console.Out.WriteLine (" done.")
 
 /// Ensure the myWebLog database exists
-let checkDatabase (cfg : DataConfig) =
+let private checkDatabase (cfg : DataConfig) =
   logStep "|> Checking database"
   let dbs = r.DbList().RunListAsync<string>(cfg.Conn) |> await
   match dbs.Contains cfg.Database with
@@ -20,53 +20,50 @@ let checkDatabase (cfg : DataConfig) =
          logStepDone ()
 
 /// Ensure all required tables exist
-let checkTables cfg =
+let private checkTables cfg =
   logStep "|> Checking tables"
   let tables = r.Db(cfg.Database).TableList().RunListAsync<string>(cfg.Conn) |> await
   [ Table.Category; Table.Comment; Table.Page; Table.Post; Table.User; Table.WebLog ]
-  |> List.map (fun tbl -> match tables.Contains tbl with
+  |> List.map    (fun tbl -> match tables.Contains tbl with true -> None | _ -> Some (tbl, r.TableCreate tbl))
-                          | true -> None
+  |> List.filter Option.isSome
-                          | _    -> Some (tbl, r.TableCreate tbl))
+  |> List.map    Option.get
-  |> List.filter (fun create -> create.IsSome)
-  |> List.map    (fun create -> create.Value)
   |> List.iter   (fun (tbl, create) -> logStepStart (sprintf "  Creating table %s" tbl)
                                        create.RunResultAsync(cfg.Conn) |> await |> ignore
                                        logStepDone ())
 
 /// Shorthand to get the table
-let tbl cfg table = r.Db(cfg.Database).Table(table)
+let private tbl cfg table = r.Db(cfg.Database).Table(table)
 
 /// Create the given index
-let createIndex cfg table (index : string * (ReqlExpr -> obj) option) =
+let private createIndex cfg table (index : string * (ReqlExpr -> obj) option) =
   let idxName, idxFunc = index
   logStepStart (sprintf """  Creating index "%s" on table %s""" idxName table)
-  match idxFunc with
+  (match idxFunc with
-  | Some f -> (tbl cfg table).IndexCreate(idxName, f).RunResultAsync(cfg.Conn)
+   | Some f -> (tbl cfg table).IndexCreate(idxName, f)
-  | None   -> (tbl cfg table).IndexCreate(idxName   ).RunResultAsync(cfg.Conn)
+   | None -> (tbl cfg table).IndexCreate(idxName))
+    .RunResultAsync(cfg.Conn)
   |> await |> ignore
   (tbl cfg table).IndexWait(idxName).RunAtomAsync(cfg.Conn) |> await |> ignore
   logStepDone ()
 
 /// Ensure that the given indexes exist, and create them if required
-let ensureIndexes cfg (indexes : (string * (string * (ReqlExpr -> obj) option) list) list) =
+let private ensureIndexes cfg (indexes : (string * (string * (ReqlExpr -> obj) option) list) list) =
-  let ensureForTable tabl =
+  let ensureForTable (tblName, idxs) =
-    let idx = (tbl cfg (fst tabl)).IndexList().RunListAsync<string>(cfg.Conn) |> await
+    let idx = (tbl cfg tblName).IndexList().RunListAsync<string>(cfg.Conn) |> await
-    snd tabl
+    idxs
-    |> List.iter (fun index -> match idx.Contains (fst index) with
+    |> List.iter (fun index -> match idx.Contains (fst index) with true -> () | _ -> createIndex cfg tblName index)
-                                | true -> ()
-                                | _    -> createIndex cfg (fst tabl) index)
   indexes
   |> List.iter ensureForTable
 
 /// Create an index on a single field
-let singleField (name : string) : obj = upcast (fun row -> (row :> ReqlExpr).[name])
+let private singleField (name : string) : obj = upcast (fun row -> (row :> ReqlExpr).[name])
 
 /// Create an index on web log Id and the given field
-let webLogField (name : string) : (ReqlExpr -> obj) option =
+let private webLogField (name : string) : (ReqlExpr -> obj) option =
   Some <| fun row -> upcast r.Array(row.["webLogId"], row.[name])
 
 /// Ensure all the required indexes exist
-let checkIndexes cfg =
+let private checkIndexes cfg =
   logStep "|> Checking indexes"
   [ Table.Category, [ "WebLogId", None
                       "Slug",     webLogField "Slug"

src/myWebLog.Data/Table.fs

@@ -1,4 +1,6 @@
-module MyWebLog.Data.Table
+/// Constants for tables used in myWebLog
+[<RequireQualifiedAccess>]
+module MyWebLog.Data.Table
 
 /// The Category table
 let Category = "Category"

src/myWebLog.Resources/Resources.Designer.cs

@@ -240,6 +240,15 @@ namespace MyWebLog {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Could not convert config.json to myWebLog configuration.
+        /// </summary>
+        public static string ErrBadAppConfig {
+            get {
+                return ResourceManager.GetString("ErrBadAppConfig", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Invalid e-mail address or password.
         /// </summary>

src/myWebLog.Resources/Resources.resx

@@ -327,4 +327,7 @@
   <data name="Seconds" xml:space="preserve">
     <value>Seconds</value>
   </data>
+  <data name="ErrBadAppConfig" xml:space="preserve">
+    <value>Could not convert config.json to myWebLog configuration</value>
+  </data>
 </root>

src/myWebLog.Web/App.fs

@@ -24,22 +24,22 @@ open System
 open System.IO
 open System.Text.RegularExpressions
 
-/// Set up a database connection
+/// Establish the configuration for this instance
-let cfg = try DataConfig.FromJson (System.IO.File.ReadAllText "data-config.json")
+let cfg = try AppConfig.FromJson (System.IO.File.ReadAllText "config.json")
-          with ex -> raise <| ApplicationException(Resources.ErrDataConfig, ex)
+          with ex -> raise <| ApplicationException(Resources.ErrBadAppConfig, ex)
 
 do
-  startUpCheck cfg
+  startUpCheck cfg.DataConfig
   
 /// Support RESX lookup via the @Translate SSVE alias
 type TranslateTokenViewEngineMatcher() =
   static let regex = Regex("@Translate\.(?<TranslationKey>[a-zA-Z0-9-_]+);?", RegexOptions.Compiled)
   interface ISuperSimpleViewEngineMatcher with
     member this.Invoke (content, model, host) =
-      regex.Replace(content, fun m -> let key = m.Groups.["TranslationKey"].Value
+      let translate (m : Match) =
-                                      match MyWebLog.Resources.ResourceManager.GetString key with
+        let key = m.Groups.["TranslationKey"].Value
-                                      | null -> key
+        match MyWebLog.Resources.ResourceManager.GetString key with null -> key | xlat -> xlat
-                                      | xlat -> xlat)
+      regex.Replace(content, translate)
 
 
 /// Handle forms authentication
@@ -47,8 +47,6 @@ type MyWebLogUser(name, claims) =
   interface IUserIdentity with
     member this.UserName with get() = name
     member this.Claims   with get() = claims
-(*member this.UserName with get() = (this :> IUserIdentity).UserName
-  member this.Claims   with get() = (this :> IUserIdentity).Claims -- do we need these? *)
  
 type MyWebLogUserMapper(container : TinyIoCContainer) =
   
@@ -71,23 +69,24 @@ type MyWebLogBootstrapper() =
 
   override this.ConfigureConventions (conventions) =
     base.ConfigureConventions conventions
-    conventions.StaticContentsConventions.Add
-      (StaticContentConventionBuilder.AddDirectory("admin/content", "views/admin/content"))
     // Make theme content available at [theme-name]/
-    Directory.EnumerateDirectories (Path.Combine [| "views"; "themes" |])
+    let addContentDir dir =
-    |> Seq.iter (fun dir -> let contentDir = Path.Combine [| dir; "content" |]
+      let contentDir = Path.Combine [| dir; "content" |]
       match Directory.Exists contentDir with
       | true -> conventions.StaticContentsConventions.Add
-                                        (StaticContentConventionBuilder.AddDirectory
+                  (StaticContentConventionBuilder.AddDirectory ((Path.GetFileName dir), contentDir))
-                                          ((Path.GetFileName dir), contentDir))
+      | _ -> ()
-                            | _    -> ())
+    conventions.StaticContentsConventions.Add
+      (StaticContentConventionBuilder.AddDirectory("admin/content", "views/admin/content"))
+    Directory.EnumerateDirectories (Path.Combine [| "views"; "themes" |])
+    |> Seq.iter addContentDir
 
   override this.ApplicationStartup (container, pipelines) =
     base.ApplicationStartup (container, pipelines)
     // Data configuration (both config and the connection; Nancy modules just need the connection)
-    container.Register<DataConfig>(cfg)
+    container.Register<AppConfig>(cfg)
     |> ignore
-    container.Register<IConnection>(cfg.Conn)
+    container.Register<IConnection>(cfg.DataConfig.Conn)
     |> ignore
     // NodaTime
     container.Register<IClock>(SystemClock.Instance)
@@ -97,20 +96,20 @@ type MyWebLogBootstrapper() =
       Seq.singleton (TranslateTokenViewEngineMatcher() :> ISuperSimpleViewEngineMatcher))
     |> ignore
     // Forms authentication configuration
-    let salt = (System.Text.ASCIIEncoding()).GetBytes "NoneOfYourBeesWax"
     let auth =
       FormsAuthenticationConfiguration(
-        CryptographyConfiguration = CryptographyConfiguration
+        CryptographyConfiguration =
-                                      (RijndaelEncryptionProvider(PassphraseKeyGenerator("Secrets",     salt)),
+          CryptographyConfiguration(
-                                              DefaultHmacProvider(PassphraseKeyGenerator("Clandestine", salt))),
+            RijndaelEncryptionProvider(PassphraseKeyGenerator(cfg.AuthEncryptionPassphrase, cfg.AuthSalt)),
+            DefaultHmacProvider(PassphraseKeyGenerator(cfg.AuthHmacPassphrase, cfg.AuthSalt))),
         RedirectUrl = "~/user/logon",
         UserMapper  = container.Resolve<IUserMapper>())
     FormsAuthentication.Enable (pipelines, auth)
     // CSRF
     Csrf.Enable pipelines
     // Sessions
-    let sessions = RethinkDbSessionConfiguration(cfg.Conn)
+    let sessions = RethinkDbSessionConfiguration(cfg.DataConfig.Conn)
-    sessions.Database <- cfg.Database
+    sessions.Database <- cfg.DataConfig.Database
     PersistableSessions.Enable (pipelines, sessions)
     ()
 
@@ -130,7 +129,7 @@ type RequestEnvironment() =
     member this.Initialize (pipelines, context) =
       let establishEnv (ctx : NancyContext) =
         ctx.Items.[Keys.RequestStart] <- DateTime.Now.Ticks
-        match tryFindWebLogByUrlBase cfg.Conn ctx.Request.Url.HostName with
+        match tryFindWebLogByUrlBase cfg.DataConfig.Conn ctx.Request.Url.HostName with
         | Some webLog -> ctx.Items.[Keys.WebLog] <- webLog
         | None -> // TODO: redirect to domain set up page
                   ApplicationException (sprintf "%s %s" ctx.Request.Url.HostName Resources.ErrNotConfigured)

src/myWebLog.Web/AppConfig.fs

@@ -0,0 +1,33 @@
+namespace MyWebLog
+
+open MyWebLog.Data
+open Newtonsoft.Json
+open System.Text
+
+/// Configuration for this myWebLog instance
+type AppConfig =
+  { /// The text from which to derive salt to use for passwords
+    [<JsonProperty("password-salt")>]
+    PasswordSaltString : string
+    /// The text from which to derive salt to use for forms authentication
+    [<JsonProperty("auth-salt")>]
+    AuthSaltString : string
+    /// The encryption passphrase to use for forms authentication
+    [<JsonProperty("encryption-passphrase")>]
+    AuthEncryptionPassphrase : string
+    /// The HMAC passphrase to use for forms authentication
+    [<JsonProperty("hmac-passphrase")>]
+    AuthHmacPassphrase : string
+    /// The data configuration
+    [<JsonProperty("data")>]
+    DataConfig : DataConfig }
+ with
+  /// The salt to use for passwords
+  member this.PasswordSalt = Encoding.UTF8.GetBytes this.PasswordSaltString
+  /// The salt to use for forms authentication
+  member this.AuthSalt = Encoding.UTF8.GetBytes this.AuthSaltString
+
+  /// Deserialize the configuration from the JSON file
+  static member FromJson json =
+    let cfg = JsonConvert.DeserializeObject<AppConfig> json
+    { cfg with DataConfig = DataConfig.Connect cfg.DataConfig }

src/myWebLog.Web/CategoryModule.fs

@@ -30,7 +30,7 @@ type CategoryModule(conn : IConnection) as this =
     this.RequiresAccessLevel AuthorizationLevel.Administrator
     let catId = parameters.["id"].ToString ()
     match (match catId with
-           | "new" -> Some Category.empty
+           | "new" -> Some Category.Empty
            | _ -> tryFindCategory conn this.WebLog.Id catId) with
     | Some cat -> let model = CategoryEditModel(this.Context, this.WebLog, cat)
                   model.Categories <- getAllCategories conn this.WebLog.Id
@@ -45,9 +45,7 @@ type CategoryModule(conn : IConnection) as this =
     this.RequiresAccessLevel AuthorizationLevel.Administrator
     let catId  = parameters.["id"].ToString ()
     let form   = this.Bind<CategoryForm> ()
-    let oldCat = match catId with
+    let oldCat = match catId with "new" -> Some Category.Empty | _ -> tryFindCategory conn this.WebLog.Id catId
-                 | "new" -> Some Category.empty
-                 | _     -> tryFindCategory conn this.WebLog.Id catId
     match oldCat with
     | Some old -> let cat = { old with Name        = form.Name
                                        Slug        = form.Slug

src/myWebLog.Web/Keys.fs

@@ -1,11 +1,17 @@
-module MyWebLog.Keys
+[<RequireQualifiedAccess>]
+module MyWebLog.Keys
 
+/// Messages stored in the session
 let Messages = "messages"
 
+/// The request start time (stored in the context for each request)
 let RequestStart = "request-start"
 
+/// The current user
 let User = "user"
 
+/// The version of myWebLog
 let Version = "version"
 
+/// The web log
 let WebLog = "web-log"

src/myWebLog.Web/PageModule.fs

@@ -51,9 +51,7 @@ type PageModule(conn : IConnection, clock : IClock) as this =
     let pageId = parameters.["id"].ToString ()
     let form   = this.Bind<EditPageForm> ()
     let now    = clock.Now.Ticks
-    match (match pageId with
+    match (match pageId with "new" -> Some Page.Empty | _ -> tryFindPage conn this.WebLog.Id pageId) with
-           | "new" -> Some Page.Empty
-           | _     -> tryFindPage conn this.WebLog.Id pageId) with
     | Some p -> let page = match pageId with "new" -> { p with WebLogId = this.WebLog.Id } | _ -> p
                 let pId = { p with
                               Title       = form.Title
@@ -72,7 +70,7 @@ type PageModule(conn : IConnection, clock : IClock) as this =
                     Level   = Level.Info
                     Message = System.String.Format
                                 (Resources.MsgPageEditSuccess,
-                                 (match pageId with | "new" -> Resources.Added | _ -> Resources.Updated)) }
+                                 (match pageId with "new" -> Resources.Added | _ -> Resources.Updated)) }
                 |> model.AddMessage
                 this.Redirect (sprintf "/page/%s/edit" pId) model
     | None -> this.NotFound ()

src/myWebLog.Web/PostModule.fs

@@ -86,9 +86,7 @@ type PostModule(conn : IConnection, clock : IClock) as this =
                        | true -> false
                        | _ -> Option.isSome <| tryFindOlderPost conn (List.head model.Posts).Post
     model.UrlPrefix <- "/posts"
-    model.PageTitle <- match pageNbr with
+    model.PageTitle <- match pageNbr with 1 -> "" | _ -> sprintf "%s%i" Resources.PageHash pageNbr
-                       | 1 -> ""
-                       | _ -> sprintf "%s%i" Resources.PageHash pageNbr
     this.ThemedView "index" model
 
   /// Display either the newest posts or the configured home page
@@ -163,7 +161,7 @@ type PostModule(conn : IConnection, clock : IClock) as this =
                        | true -> false
                        | _ -> Option.isSome <| tryFindOlderTaggedPost conn tag (List.last model.Posts).Post
     model.UrlPrefix <- sprintf "/tag/%s" tag
-    model.PageTitle <- sprintf "\"%s\" Tag%s" tag (match pageNbr with | 1 -> "" | n -> sprintf " | Page %i" n)
+    model.PageTitle <- sprintf "\"%s\" Tag%s" tag (match pageNbr with 1 -> "" | n -> sprintf " | Page %i" n)
     model.Subtitle  <- Some <| sprintf "Posts tagged \"%s\"" tag
     this.ThemedView "index" model
 
@@ -195,9 +193,7 @@ type PostModule(conn : IConnection, clock : IClock) as this =
   member this.EditPost (parameters : DynamicDictionary) =
     this.RequiresAccessLevel AuthorizationLevel.Administrator
     let postId = parameters.["postId"].ToString ()
-    match (match postId with
+    match (match postId with "new" -> Some Post.Empty | _ -> tryFindPost conn this.WebLog.Id postId) with
-           | "new" -> Some Post.Empty
-           | _     -> tryFindPost conn this.WebLog.Id postId) with
     | Some post -> let rev = match post.Revisions
                                    |> List.sortByDescending (fun r -> r.AsOf)
                                    |> List.tryHead with
@@ -220,9 +216,7 @@ type PostModule(conn : IConnection, clock : IClock) as this =
     let postId = parameters.["postId"].ToString ()
     let form   = this.Bind<EditPostForm>()
     let now    = clock.Now.Ticks
-    match (match postId with
+    match (match postId with "new" -> Some Post.Empty | _ -> tryFindPost conn this.WebLog.Id postId) with
-           | "new" -> Some Post.Empty
-           | _     -> tryFindPost conn this.WebLog.Id postId) with
     | Some p -> let justPublished = p.PublishedOn = int64 0 && form.PublishNow
                 let post          = match postId with
                                     | "new" -> { p with

src/myWebLog.Web/UserModule.fs

@@ -12,12 +12,12 @@ open RethinkDb.Driver.Net
 open System.Text
 
 /// Handle /user URLs
-type UserModule(conn : IConnection) as this =
+type UserModule(conn : IConnection, cfg : AppConfig) as this =
   inherit NancyModule("/user")
 
   /// Hash the user's password
   let pbkdf2 (pw : string) =
-    PassphraseKeyGenerator(pw, UTF8Encoding().GetBytes("// TODO: make this salt part of the config"), 4096).GetBytes 512
+    PassphraseKeyGenerator(pw, cfg.PasswordSalt, 4096).GetBytes 512
     |> Seq.fold (fun acc byt -> sprintf "%s%s" acc (byt.ToString "x2")) ""
   
   do
@@ -29,9 +29,7 @@ type UserModule(conn : IConnection) as this =
   member this.ShowLogOn () =
     let model = LogOnModel(this.Context, this.WebLog)
     let query = this.Request.Query :?> DynamicDictionary
-    model.Form.ReturnUrl <- match query.ContainsKey "returnUrl" with
+    model.Form.ReturnUrl <- match query.ContainsKey "returnUrl" with true -> query.["returnUrl"].ToString () | _ -> ""
-                            | true -> query.["returnUrl"].ToString ()
-                            | _    -> ""
     upcast this.View.["admin/user/logon", model]
 
   /// Process a user log on

src/myWebLog.Web/ViewModels.fs

@@ -11,6 +11,7 @@ open System
 
 
 /// Levels for a user message
+[<RequireQualifiedAccess>]
 module Level =
   /// An informational message
   let Info = "Info"
@@ -299,9 +300,9 @@ type PostModel(ctx, webLog, post) =
   /// The post being displayed
   member this.Post : Post = post
   /// The next newer post
-  member val NewerPost = Option<Post>.None with get, set
+  member val NewerPost : Post option = None with get, set
   /// The next older post
-  member val OlderPost = Option<Post>.None with get, set
+  member val OlderPost : Post option = None with get, set
   /// The date the post was published
   member this.PublishedDate = this.DisplayLongDate this.Post.PublishedOn
   /// The time the post was published
@@ -343,7 +344,7 @@ type PostForDisplay(webLog : WebLog, post : Post) =
 type PostsModel(ctx, webLog) =
   inherit MyWebLogModel(ctx, webLog)
   /// The subtitle for the page
-  member val Subtitle = Option<string>.None with get, set
+  member val Subtitle : string option = None with get, set
   /// The posts to display
   member val Posts : PostForDisplay list = [] with get, set
   /// The page number of the post list

src/myWebLog.Web/myWebLog.Web.fsproj

@@ -52,6 +52,7 @@
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="Keys.fs" />
+    <Compile Include="AppConfig.fs" />
     <Compile Include="ViewModels.fs" />
     <Compile Include="ModuleExtensions.fs" />
     <Compile Include="AdminModule.fs" />

src/myWebLog/config.json

@@ -0,0 +1,17 @@
+{
+  // https://www.grc.com/passwords.htm is a great source of high-entropy passwords for these first 4 settings.
+  // Although what is there looks strong, keep in mind that it's what's in source control, so all instances of myWebLog
+  // could be using these values; that severly decreases their usefulness. :)
+  //
+  // WARNING: Changing this first one will render every single user's login inaccessible, including yours.  Only do
+  //          this if you are editing this file before setting up an instance, or if that is what you intend to do.
+  "password-salt": "3RVkw1jESpLFHr8F3WTThSbFnO3tFrMIckQsKzc9dymzEEXUoUS7nurF4rGpJ8Z",
+  // Changing any of these next 3 will render all current logins invalid, and the user will be force to reauthenticate.
+  "auth-salt": "2TweL5wcyGWg5CmMqZSZMonbe9xqQ2Q4vDNeysFRaUgVs4BpFZL85Iew79tn2IJ",
+  "encryption-passphrase": "jZjY6XyqUZypBcT0NaDXjEKc8xUjB4eb4V9EDHDedadRLuRUeRvIQx67yhx6bQP",
+  "hmac-passphrase": "42dzKb93X8YUkK8ms8JldjtkEvCKnPQGWCkO2yFaZ7lkNwECGCX00xzrx5ZSElO",
+  "data": {
+    "database": "myWebLog",
+    "hostname": "severus-server"
+  }
+}

src/myWebLog/data-config.json

@@ -1,4 +0,0 @@
-{
-  "database": "myWebLog",
-  "hostname": "severus-server"
-}

src/myWebLog/myWebLog.csproj

@@ -48,7 +48,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <Content Include="data-config.json">
+    <Content Include="config.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="views\themes\default\content\bootstrap-theme.css.map">