From 1fd16ee43478f9d0fb2c7fb4d2e2715d076e736c Mon Sep 17 00:00:00 2001 From: Frederik Ring Date: Wed, 1 May 2019 20:34:00 -0600 Subject: [PATCH] refer to real world .dev domain --- CODE_OF_CONDUCT.md | 2 +- README.md | 12 ++++++------ docker-compose.yml | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index f2ad146..da70cb4 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -55,7 +55,7 @@ further defined and clarified by project maintainers. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at frederik.ring@gmail.com. All +reported by contacting the project team at mail@offen.dev. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. diff --git a/README.md b/README.md index 99dcafe..34c6402 100644 --- a/README.md +++ b/README.md @@ -18,22 +18,22 @@ Project planning and issue tracking is done using [Pivotal Tracker](https://www. #### Local cookies and SSL -In local development __offen__ requires to be served both via SSL (in order to use window.crypto) as well as a `local.offen.org` host. +In local development __offen__ requires to be served both via SSL (in order to use window.crypto) as well as a `local.offen.dev` host. This requires the following steps to be taken: 1. Edit your `/etc/hosts` to include the following line: ``` - 127.0.0.1 local.offen.org + 127.0.0.1 local.offen.dev ``` 2. Install and setup [mkcert](https://github.com/FiloSottile/mkcert). Assuming you have Go installed, this looks like: ``` $ go get -u github.com/FiloSottile/mkcert $ mkcert -install ``` -3. Navigate into the repository root and create a local certificate and key for the `local.offen.org` host: +3. Navigate into the repository root and create a local certificate and key for the `local.offen.dev` host: ``` - $ mkcert local.offen.org + $ mkcert local.offen.dev ``` You can test setup by starting the application: @@ -42,7 +42,7 @@ You can test setup by starting the application: $ docker-compose up ``` -Now you should be able to access in your browser without any security warnings. +Now you should be able to access in your browser without any security warnings. #### `server` @@ -93,4 +93,4 @@ npm test ### License -MIT © offen +MIT © [offen](https://www.offen.dev) diff --git a/docker-compose.yml b/docker-compose.yml index 6e054a6..21667e4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,15 +3,15 @@ server: working_dir: /server volumes: - ./server:/server - - ./local.offen.org.pem:/server/local.offen.org.pem - - ./local.offen.org-key.pem:/server/local.offen.org-key.pem + - ./local.offen.dev.pem:/server/local.offen.dev.pem + - ./local.offen.dev-key.pem:/server/local.offen.dev-key.pem - $GOPATH/pkg/mod:/go/pkg/mod environment: - GOPATH=/go - POSTGRES_CONNECTION_STRING=postgres://postgres:develop@database:5432/postgres?sslmode=disable ports: - 8080:8080 - command: go run cmd/server/main.go -conn postgres://postgres:develop@database:5432/postgres?sslmode=disable -key local.offen.org-key.pem -cert local.offen.org.pem + command: go run cmd/server/main.go -conn postgres://postgres:develop@database:5432/postgres?sslmode=disable -key local.offen.dev-key.pem -cert local.offen.dev.pem links: - database @@ -25,8 +25,8 @@ vault: working_dir: /vault volumes: - ./vault:/vault - - ./local.offen.org.pem:/vault/local.offen.org.pem - - ./local.offen.org-key.pem:/vault/local.offen.org-key.pem + - ./local.offen.dev.pem:/vault/local.offen.dev.pem + - ./local.offen.dev-key.pem:/vault/local.offen.dev-key.pem command: npm start -- --port 9977 ports: - 9977:9977