Skip to content

Commit

Permalink
Merge pull request #14 from NotAProton/main
Browse files Browse the repository at this point in the history
  • Loading branch information
NotAProton authored Mar 13, 2022
2 parents 21f34e1 + 3e2e484 commit 85a780b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
4 changes: 2 additions & 2 deletions dist/.env
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ dbUserPass=changemetoo
domain=localhost

#use echo $(htpasswd -nb username password) to generate the the creds
dashboardcreds=reallycoolname:$apr1$vrqMeki4$VnVojXpoCz5XUJqUPL/ZN1
db_access_creds=reallycoolname:$apr1$d9E3YJGl$H.dPmMISUYqayf3TpBNEW/
dashboardcreds=user:$apr1$MexAolZ7$qu78x6Ljq4AZjYCqgiyGn.
db_access_creds=user:$apr1$MexAolZ7$qu78x6Ljq4AZjYCqgiyGn.
#db_access_creds is a http layer in front of adminer, so you need 2 layers of authentication before accessing the db

acme_email=[email protected]
3 changes: 2 additions & 1 deletion dist/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:

#SSl
- "--certificatesresolvers.myresolver.acme.tlschallenge=true"
# - "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory"
- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory"
- "--certificatesresolvers.myresolver.acme.email=${acme_email}"
- "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json"
labels:
Expand All @@ -45,6 +45,7 @@ services:
- "/var/run/docker.sock:/var/run/docker.sock:ro"
networks:
- web
restart: on-failure

ffserver:
image: ghcr.io/fastforwardteam/server:latest
Expand Down
7 changes: 5 additions & 2 deletions src/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,13 @@ func main() {
parseEnv()

logStart()
connectDb()
err := connectDb()
if err != nil {
logger.Fatalln(err)
}

//check connection to db
err := db.Ping()
err = db.Ping()
if err != nil {
logger.Fatalln(err)
}
Expand Down

0 comments on commit 85a780b

Please sign in to comment.