Browse Source

cmd: update flag defaults for dev mode

Updates flags in dex-worker for no-db mode to work with default static
files.
pull/517/head
Lucas Serven 10 years ago
parent
commit
a9dce1c11e
  1. 6
      .gitignore
  2. 8
      cmd/dex-worker/main.go
  3. 1
      static/fixtures/connectors.json.sample
  4. 0
      static/fixtures/emailer.json

6
.gitignore vendored

@ -26,10 +26,4 @@ _testmain.go
bin/ bin/
coverage/ coverage/
deploy/ deploy/
Godeps/_workspace/src/github.com/coreos/dex
static/fixtures/env.txt
static/fixtures/clients.json
static/fixtures/connectors.json
static/fixtures/users.json
static/fixtures/emailer.json
gopath/ gopath/

8
cmd/dex-worker/main.go

@ -69,10 +69,10 @@ func main() {
dbMaxOpenConns := fs.Int("db-max-open-conns", 0, "maximum number of open connections to the database") dbMaxOpenConns := fs.Int("db-max-open-conns", 0, "maximum number of open connections to the database")
printVersion := fs.Bool("version", false, "Print the version and exit") printVersion := fs.Bool("version", false, "Print the version and exit")
// used only if --no-db is set // These are configuration files for development convenience, only used if --no-db is set.
connectors := fs.String("connectors", "./static/fixtures/connectors.json", "JSON file containg set of IDPC configs") connectors := fs.String("connectors", "./static/fixtures/connectors.json.sample", "JSON file containg set of IDPC configs")
clients := fs.String("clients", "./static/fixtures/clients.json", "json file containing set of clients") clients := fs.String("clients", "./static/fixtures/clients.json.sample", "json file containing set of clients")
users := fs.String("users", "./static/fixtures/users.json", "json file containing set of users") users := fs.String("users", "./static/fixtures/users.json.sample", "json file containing set of users")
logDebug := fs.Bool("log-debug", false, "log debug-level information") logDebug := fs.Bool("log-debug", false, "log debug-level information")
logTimestamps := fs.Bool("log-timestamps", false, "prefix log lines with timestamps") logTimestamps := fs.Bool("log-timestamps", false, "prefix log lines with timestamps")

1
static/fixtures/connectors.json.sample

@ -28,7 +28,6 @@
"host": "127.0.0.1:389", "host": "127.0.0.1:389",
"useTLS": true, "useTLS": true,
"useSSL": false, "useSSL": false,
"caFile": "/etc/ssl/certs/example_com_root.crt",
"skipCertVerification": false, "skipCertVerification": false,
"baseDN": "ou=People,dc=example,dc=com", "baseDN": "ou=People,dc=example,dc=com",
"nameAttribute": "cn", "nameAttribute": "cn",

0
static/fixtures/emailer.json.sample → static/fixtures/emailer.json

Loading…
Cancel
Save