mystiq/dex
Archived
4
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #205 from coreos/example-email

Browse source 
*: use example.com in place of coreos.com
This commit is contained in:
bobbyrullo 2015-12-07 15:42:06 -08:00
commit 8cec2d6ba9
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build-docker-push
View file

@ -9,7 +9,7 @@ if [ -v $DOCKER_USER ] || [ -v $DOCKER_PASSWORD ]; then
echo "env variables not set: DOCKER_USER, DOCKER_PASSWORD. skipping login, assuming creds in .dockercfg" echo "env variables not set: DOCKER_USER, DOCKER_PASSWORD. skipping login, assuming creds in .dockercfg"
else else
echo logging in as $DOCKER_USER echo logging in as $DOCKER_USER
docker login --username="$DOCKER_USER" --password="$DOCKER_PASSWORD" --email="docker.login@coreos.com" $DOCKER_REGISTRY docker login --username="$DOCKER_USER" --password="$DOCKER_PASSWORD" --email="dex@example.com" $DOCKER_REGISTRY
fi fi
git_sha=$(git rev-parse HEAD) git_sha=$(git rev-parse HEAD)

2
cmd/dex-worker/main.go
View file

@ -41,7 +41,7 @@ func main() {
emailTemplateDirs := flagutil.StringSliceFlag{"./static/email"} emailTemplateDirs := flagutil.StringSliceFlag{"./static/email"}
fs.Var(&emailTemplateDirs, "email-templates", "comma separated list of directories of email template files") fs.Var(&emailTemplateDirs, "email-templates", "comma separated list of directories of email template files")
emailFrom := fs.String("email-from", "no-reply@coreos.com", "emails sent from dex will come from this address") emailFrom := fs.String("email-from", "", "emails sent from dex will come from this address")
emailConfig := fs.String("email-cfg", "./static/fixtures/emailer.json", "configures emailer.") emailConfig := fs.String("email-cfg", "./static/fixtures/emailer.json", "configures emailer.")
enableRegistration := fs.Bool("enable-registration", false, "Allows users to self-register") enableRegistration := fs.Bool("enable-registration", false, "Allows users to self-register")

2
examples/emailtester/main.go
View file

@ -54,7 +54,7 @@ func main() {
log.EnableDebug() log.EnableDebug()
emailTemplates := flag.String("templates-dir", "./static/email", "directory of email template files") emailTemplates := flag.String("templates-dir", "./static/email", "directory of email template files")
emailFrom := flag.String("from", "no-reply@coreos.com", "") emailFrom := flag.String("from", "no-reply@example.com", "")
emailTo := flag.String("to", "", "") emailTo := flag.String("to", "", "")
emailConfig := flag.String("cfg", "./static/fixtures/emailer.json", "configures emailer.") emailConfig := flag.String("cfg", "./static/fixtures/emailer.json", "configures emailer.")
tplName := flag.String("template", "verify-email", "which email template to use.") tplName := flag.String("template", "verify-email", "which email template to use.")