Add in settings.yml

.gitignore

@@ -15,7 +15,6 @@ cabal.sandbox.config
 /dev-blob-store/
 TAGS
 /config/postgresql.yml
-/config/settings.yml
 /tarballs/
 stackage-server.keter
 /stackage-content/

config/settings.yml

@@ -0,0 +1,17 @@
+Default: &defaults
+  host: "*4" # any IPv4 host
+  port: 3000
+  approot: "http://localhost:3000"
+
+Development:
+  <<: *defaults
+
+Testing:
+  <<: *defaults
+
+Staging:
+  <<: *defaults
+
+Production:
+  approot: "http://www.stackage.org"
+  <<: *defaults

config/settings.yml-sample

@@ -1,33 +0,0 @@
-Default: &defaults
-  host: "*4" # any IPv4 host
-  port: 3000
-  approot: "http://localhost:3000"
-  hackage-root: http://hackage.fpcomplete.com
-  admin-users:
-  - fpcomplete
-  # google-auth:
-    # client-id: foo
-    # client-secret: bar
-
-Development:
-  <<: *defaults
-  blob-store: file:dev-blob-store
-
-Testing:
-  <<: *defaults
-
-Staging:
-  <<: *defaults
-
-Production:
-  #approot: "http://www.example.com"
-  <<: *defaults
-  blob-store: file:/tmp/stackage-server
-
-# S3-backed storaged
-#  blob-store:
-#    type: aws
-#    local: /tmp/stackage-server
-#    access: someaccesskey
-#    secret: somesecretkey
-#    bucket: somebucket