Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Yesod template updates
  • Loading branch information
snoyberg committed Jun 17, 2018
1 parent 9f841b0 commit c9d9d56
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 48 deletions.
14 changes: 7 additions & 7 deletions yesod-mongo.hsfiles
Expand Up @@ -337,17 +337,17 @@ User-agent: *
/profile ProfileR GET

{-# START_FILE config/settings.yml #-}
# Values formatted like "_env:ENV_VAR_NAME:default_value" can be overridden by the specified environment variable.
# Values formatted like "_env:YESOD_ENV_VAR_NAME:default_value" can be overridden by the specified environment variable.
# See https://github.com/yesodweb/yesod/wiki/Configuration#overriding-configuration-values-with-environment-variables

static-dir: "_env:STATIC_DIR:static"
host: "_env:HOST:*4" # any IPv4 host
port: "_env:PORT:3000" # NB: The port `yesod devel` uses is distinct from this value. Set the `yesod devel` port from the command line.
ip-from-header: "_env:IP_FROM_HEADER:false"
static-dir: "_env:YESOD_STATIC_DIR:static"
host: "_env:YESOD_HOST:*4" # any IPv4 host
port: "_env:YESOD_PORT:3000" # NB: The port `yesod devel` uses is distinct from this value. Set the `yesod devel` port from the command line.
ip-from-header: "_env:YESOD_IP_FROM_HEADER:false"

# Default behavior: determine the application root from the request headers.
# Uncomment to set an explicit approot
#approot: "_env:APPROOT:http://localhost:3000"
#approot: "_env:YESOD_APPROOT:http://localhost:3000"

# By default, `yesod devel` runs in development, and built executables use
# production settings (see below). To override this, use the following:
Expand All @@ -364,7 +364,7 @@ ip-from-header: "_env:IP_FROM_HEADER:false"
# skip-combining: false
# auth-dummy-login : false

# NB: If you need a numeric value (e.g. 123) to parse as a String, wrap it in single quotes (e.g. "_env:PGPASS:'123'")
# NB: If you need a numeric value (e.g. 123) to parse as a String, wrap it in single quotes (e.g. "_env:YESOD_PGPASS:'123'")
# See https://github.com/yesodweb/yesod/wiki/Configuration#parsing-numeric-values-as-strings

database:
Expand Down
26 changes: 13 additions & 13 deletions yesod-mysql.hsfiles
Expand Up @@ -350,17 +350,17 @@ User-agent: *
/profile ProfileR GET

{-# START_FILE config/settings.yml #-}
# Values formatted like "_env:ENV_VAR_NAME:default_value" can be overridden by the specified environment variable.
# Values formatted like "_env:YESOD_ENV_VAR_NAME:default_value" can be overridden by the specified environment variable.
# See https://github.com/yesodweb/yesod/wiki/Configuration#overriding-configuration-values-with-environment-variables

static-dir: "_env:STATIC_DIR:static"
host: "_env:HOST:*4" # any IPv4 host
port: "_env:PORT:3000" # NB: The port `yesod devel` uses is distinct from this value. Set the `yesod devel` port from the command line.
ip-from-header: "_env:IP_FROM_HEADER:false"
static-dir: "_env:YESOD_STATIC_DIR:static"
host: "_env:YESOD_HOST:*4" # any IPv4 host
port: "_env:YESOD_PORT:3000" # NB: The port `yesod devel` uses is distinct from this value. Set the `yesod devel` port from the command line.
ip-from-header: "_env:YESOD_IP_FROM_HEADER:false"

# Default behavior: determine the application root from the request headers.
# Uncomment to set an explicit approot
#approot: "_env:APPROOT:http://localhost:3000"
#approot: "_env:YESOD_APPROOT:http://localhost:3000"

# By default, `yesod devel` runs in development, and built executables use
# production settings (see below). To override this, use the following:
Expand All @@ -377,17 +377,17 @@ ip-from-header: "_env:IP_FROM_HEADER:false"
# skip-combining: false
# auth-dummy-login : false

# NB: If you need a numeric value (e.g. 123) to parse as a String, wrap it in single quotes (e.g. "_env:PGPASS:'123'")
# NB: If you need a numeric value (e.g. 123) to parse as a String, wrap it in single quotes (e.g. "_env:YESOD_PGPASS:'123'")
# See https://github.com/yesodweb/yesod/wiki/Configuration#parsing-numeric-values-as-strings

database:
user: "_env:MYSQL_USER:{{name}}"
password: "_env:MYSQL_PASSWORD:{{name}}"
host: "_env:MYSQL_HOST:localhost"
port: "_env:MYSQL_PORT:5432"
user: "_env:YESOD_MYSQL_USER:{{name}}"
password: "_env:YESOD_MYSQL_PASSWORD:{{name}}"
host: "_env:YESOD_MYSQL_HOST:localhost"
port: "_env:YESOD_MYSQL_PORT:5432"
# See config/test-settings.yml for an override during tests
database: "_env:MYSQL_DATABASE:{{name}}"
poolsize: "_env:MYSQL_POOLSIZE:10"
database: "_env:YESOD_MYSQL_DATABASE:{{name}}"
poolsize: "_env:YESOD_MYSQL_POOLSIZE:10"

copyright: Insert copyright statement here
#analytics: UA-YOURCODE
Expand Down
26 changes: 13 additions & 13 deletions yesod-postgres.hsfiles
Expand Up @@ -343,17 +343,17 @@ User-agent: *
/profile ProfileR GET

{-# START_FILE config/settings.yml #-}
# Values formatted like "_env:ENV_VAR_NAME:default_value" can be overridden by the specified environment variable.
# Values formatted like "_env:YESOD_ENV_VAR_NAME:default_value" can be overridden by the specified environment variable.
# See https://github.com/yesodweb/yesod/wiki/Configuration#overriding-configuration-values-with-environment-variables

static-dir: "_env:STATIC_DIR:static"
host: "_env:HOST:*4" # any IPv4 host
port: "_env:PORT:3000" # NB: The port `yesod devel` uses is distinct from this value. Set the `yesod devel` port from the command line.
ip-from-header: "_env:IP_FROM_HEADER:false"
static-dir: "_env:YESOD_STATIC_DIR:static"
host: "_env:YESOD_HOST:*4" # any IPv4 host
port: "_env:YESOD_PORT:3000" # NB: The port `yesod devel` uses is distinct from this value. Set the `yesod devel` port from the command line.
ip-from-header: "_env:YESOD_IP_FROM_HEADER:false"

# Default behavior: determine the application root from the request headers.
# Uncomment to set an explicit approot
#approot: "_env:APPROOT:http://localhost:3000"
#approot: "_env:YESOD_APPROOT:http://localhost:3000"

# By default, `yesod devel` runs in development, and built executables use
# production settings (see below). To override this, use the following:
Expand All @@ -370,17 +370,17 @@ ip-from-header: "_env:IP_FROM_HEADER:false"
# skip-combining: false
# auth-dummy-login : false

# NB: If you need a numeric value (e.g. 123) to parse as a String, wrap it in single quotes (e.g. "_env:PGPASS:'123'")
# NB: If you need a numeric value (e.g. 123) to parse as a String, wrap it in single quotes (e.g. "_env:YESOD_PGPASS:'123'")
# See https://github.com/yesodweb/yesod/wiki/Configuration#parsing-numeric-values-as-strings

database:
user: "_env:PGUSER:{{name}}"
password: "_env:PGPASS:{{name}}"
host: "_env:PGHOST:localhost"
port: "_env:PGPORT:5432"
user: "_env:YESOD_PGUSER:{{name}}"
password: "_env:YESOD_PGPASS:{{name}}"
host: "_env:YESOD_PGHOST:localhost"
port: "_env:YESOD_PGPORT:5432"
# See config/test-settings.yml for an override during tests
database: "_env:PGDATABASE:{{name}}"
poolsize: "_env:PGPOOLSIZE:10"
database: "_env:YESOD_PGDATABASE:{{name}}"
poolsize: "_env:YESOD_PGPOOLSIZE:10"

copyright: Insert copyright statement here
#analytics: UA-YOURCODE
Expand Down
12 changes: 6 additions & 6 deletions yesod-simple.hsfiles
Expand Up @@ -310,17 +310,17 @@ User-agent: *
/comments CommentR POST

{-# START_FILE config/settings.yml #-}
# Values formatted like "_env:ENV_VAR_NAME:default_value" can be overridden by the specified environment variable.
# Values formatted like "_env:YESOD_ENV_VAR_NAME:default_value" can be overridden by the specified environment variable.
# See https://github.com/yesodweb/yesod/wiki/Configuration#overriding-configuration-values-with-environment-variables

static-dir: "_env:STATIC_DIR:static"
host: "_env:HOST:*4" # any IPv4 host
port: "_env:PORT:3000" # NB: The port `yesod devel` uses is distinct from this value. Set the `yesod devel` port from the command line.
ip-from-header: "_env:IP_FROM_HEADER:false"
static-dir: "_env:YESOD_STATIC_DIR:static"
host: "_env:YESOD_HOST:*4" # any IPv4 host
port: "_env:YESOD_PORT:3000" # NB: The port `yesod devel` uses is distinct from this value. Set the `yesod devel` port from the command line.
ip-from-header: "_env:YESOD_IP_FROM_HEADER:false"

# Default behavior: determine the application root from the request headers.
# Uncomment to set an explicit approot
#approot: "_env:APPROOT:http://localhost:3000"
#approot: "_env:YESOD_APPROOT:http://localhost:3000"

# By default, `yesod devel` runs in development, and built executables use
# production settings (see below). To override this, use the following:
Expand Down
18 changes: 9 additions & 9 deletions yesod-sqlite.hsfiles
Expand Up @@ -333,17 +333,17 @@ User-agent: *
/profile ProfileR GET

{-# START_FILE config/settings.yml #-}
# Values formatted like "_env:ENV_VAR_NAME:default_value" can be overridden by the specified environment variable.
# Values formatted like "_env:YESOD_ENV_VAR_NAME:default_value" can be overridden by the specified environment variable.
# See https://github.com/yesodweb/yesod/wiki/Configuration#overriding-configuration-values-with-environment-variables

static-dir: "_env:STATIC_DIR:static"
host: "_env:HOST:*4" # any IPv4 host
port: "_env:PORT:3000" # NB: The port `yesod devel` uses is distinct from this value. Set the `yesod devel` port from the command line.
ip-from-header: "_env:IP_FROM_HEADER:false"
static-dir: "_env:YESOD_STATIC_DIR:static"
host: "_env:YESOD_HOST:*4" # any IPv4 host
port: "_env:YESOD_PORT:3000" # NB: The port `yesod devel` uses is distinct from this value. Set the `yesod devel` port from the command line.
ip-from-header: "_env:YESOD_IP_FROM_HEADER:false"

# Default behavior: determine the application root from the request headers.
# Uncomment to set an explicit approot
#approot: "_env:APPROOT:http://localhost:3000"
#approot: "_env:YESOD_APPROOT:http://localhost:3000"

# By default, `yesod devel` runs in development, and built executables use
# production settings (see below). To override this, use the following:
Expand All @@ -360,13 +360,13 @@ ip-from-header: "_env:IP_FROM_HEADER:false"
# skip-combining: false
# auth-dummy-login : false

# NB: If you need a numeric value (e.g. 123) to parse as a String, wrap it in single quotes (e.g. "_env:PGPASS:'123'")
# NB: If you need a numeric value (e.g. 123) to parse as a String, wrap it in single quotes (e.g. "_env:YESOD_PGPASS:'123'")
# See https://github.com/yesodweb/yesod/wiki/Configuration#parsing-numeric-values-as-strings

database:
# See config/test-settings.yml for an override during tests
database: "_env:SQLITE_DATABASE:{{name}}.sqlite3"
poolsize: "_env:SQLITE_POOLSIZE:10"
database: "_env:YESOD_SQLITE_DATABASE:{{name}}.sqlite3"
poolsize: "_env:YESOD_SQLITE_POOLSIZE:10"

copyright: Insert copyright statement here
#analytics: UA-YOURCODE
Expand Down

0 comments on commit c9d9d56

Please sign in to comment.