Compare commits

...
8 Commits
Author SHA1 Message Date
Henrique Dias 64d6d9e93b chore: version v2.0.12 2019-05-21 10:59:36 +01:00
Henrique Dias 68902312cc fix: cannot find frontend 2019-05-21 10:59:05 +01:00
Henrique Dias a52b50b706 chore: version v2.0.11 2019-05-21 08:50:13 +01:00
Henrique DiasandGitHub 2527bdbfe1 Check if keys exist in map. Fixes: #736 (#737)
Check if keys exist in map. Fixes: #736
2019-05-21 08:46:50 +01:00
cnone 473aaf13be Check if keys exist in map. Fixes: #736 2019-05-21 01:57:01 +03:00
Henrique Dias 0844b597f8 feat: update languages 2019-05-20 22:07:06 +01:00
Henrique Dias b3a822b4e8 fix: address 2019-05-20 22:05:22 +01:00
Henrique Dias 788fadbd5e fix: remove docker-latest 2019-05-20 22:01:30 +01:00
4 changed files with 15 additions and 40 deletions
+1 -25
View File
@@ -44,21 +44,6 @@ jobs:
root: .
paths:
- '*'
docker-latest:
docker:
- image: docker
steps:
- attach_workspace:
at: '~/project'
- setup_remote_docker
- run: docker build -t filebrowser/filebrowser .
- run: docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
- run: docker push filebrowser/filebrowser
- run: docker logout
- persist_to_workspace:
root: .
paths:
- '*'
release:
docker:
- image: circleci/golang:1.12
@@ -96,13 +81,4 @@ workflows:
tags:
only: /^v.*/
branches:
ignore: /.*/
- docker-latest:
context: deploy
requires:
- build-go
filters:
branches:
only: master
tags:
ignore: /.*/
ignore: /.*/
+12 -13
View File
@@ -89,25 +89,24 @@ func getAuthentication(flags *pflag.FlagSet, defaults ...interface{}) (settings.
secret := mustGetString(flags, "recaptcha.secret")
if key == "" {
kmap := defaultAuther["recaptcha"].(map[string]interface{})
key = kmap["key"].(string)
if kmap, ok := defaultAuther["recaptcha"].(map[string]interface{}); ok {
key = kmap["key"].(string)
}
}
if secret == "" {
smap := defaultAuther["recaptcha"].(map[string]interface{})
secret = smap["secret"].(string)
if smap, ok := defaultAuther["recaptcha"].(map[string]interface{}); ok {
secret = smap["secret"].(string)
}
}
if key == "" || secret == "" {
checkErr(nerrors.New("you must set the flag 'recaptcha.key' and 'recaptcha.secret' for method 'json'"))
if key != "" && secret != "" {
jsonAuth.ReCaptcha = &auth.ReCaptcha{
Host: host,
Key: key,
Secret: secret,
}
}
jsonAuth.ReCaptcha = &auth.ReCaptcha{
Host: host,
Key: key,
Secret: secret,
}
auther = jsonAuth
}
+1 -1
View File
@@ -194,7 +194,7 @@ func getRunParams(flags *pflag.FlagSet, st *storage.Storage) *settings.Server {
}
if isAddrSet && isSocketSet {
checkErr(errors.New("--socket flag cannot be used with --adress, --port, --key nor --cert"))
checkErr(errors.New("--socket flag cannot be used with --address, --port, --key nor --cert"))
}
// Do not use saved Socket if address was manually set.