diff --git a/.gitignore b/.gitignore index cd79d1cd..a51a1642 100644 --- a/.gitignore +++ b/.gitignore @@ -26,10 +26,4 @@ _testmain.go bin/ coverage/ 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/ diff --git a/cmd/dex-worker/main.go b/cmd/dex-worker/main.go index 2b4f2c67..ac9b141a 100644 --- a/cmd/dex-worker/main.go +++ b/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") printVersion := fs.Bool("version", false, "Print the version and exit") - // used only if --no-db is set - connectors := fs.String("connectors", "./static/fixtures/connectors.json", "JSON file containg set of IDPC configs") - clients := fs.String("clients", "./static/fixtures/clients.json", "json file containing set of clients") - users := fs.String("users", "./static/fixtures/users.json", "json file containing set of users") + // These are configuration files for development convenience, only used if --no-db is set. + connectors := fs.String("connectors", "./static/fixtures/connectors.json.sample", "JSON file containg set of IDPC configs") + clients := fs.String("clients", "./static/fixtures/clients.json.sample", "json file containing set of clients") + 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") logTimestamps := fs.Bool("log-timestamps", false, "prefix log lines with timestamps") diff --git a/static/fixtures/connectors.json.sample b/static/fixtures/connectors.json.sample index d770087f..becdc2f3 100644 --- a/static/fixtures/connectors.json.sample +++ b/static/fixtures/connectors.json.sample @@ -28,7 +28,6 @@ "host": "127.0.0.1:389", "useTLS": true, "useSSL": false, - "caFile": "/etc/ssl/certs/example_com_root.crt", "skipCertVerification": false, "baseDN": "ou=People,dc=example,dc=com", "nameAttribute": "cn", diff --git a/static/fixtures/emailer.json.sample b/static/fixtures/emailer.json similarity index 100% rename from static/fixtures/emailer.json.sample rename to static/fixtures/emailer.json