CommunEu
/
Passbolt
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'kyoda-develop' into develop 

Merged PR #37
This commit is contained in:
Diego Lendoiro 2017-07-26 12:09:37 +01:00
parent 3d07473abd 1bff5a9675
commit 3c5647529b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/docker-entrypoint.sh
View File

@ -86,7 +86,6 @@ app_setup() {
local default_public_key='unsecure.key' local default_public_key='unsecure.key'
local default_private_key='unsecure_private.key' local default_private_key='unsecure_private.key'
local default_fingerprint='2FC8945833C51946E937F9FED47B0811573EE67E' local default_fingerprint='2FC8945833C51946E937F9FED47B0811573EE67E'
local default_registration='public'
local gpg_home='/var/lib/nginx/.gnupg' local gpg_home='/var/lib/nginx/.gnupg'
local auto_fingerprint=$(su -m -c "$gpg --fingerprint |grep fingerprint| awk '{for(i=4;i<=NF;++i)printf \$i}'" -ls /bin/bash nginx) local auto_fingerprint=$(su -m -c "$gpg --fingerprint |grep fingerprint| awk '{for(i=4;i<=NF;++i)printf \$i}'" -ls /bin/bash nginx)
@ -96,6 +95,7 @@ app_setup() {
sed -i s:$default_private_key:serverkey.private.asc:g $app_config sed -i s:$default_private_key:serverkey.private.asc:g $app_config
sed -i s:$default_fingerprint:${fingerprint:-$auto_fingerprint}:g $app_config sed -i s:$default_fingerprint:${fingerprint:-$auto_fingerprint}:g $app_config
sed -i "/force/ s:true:${ssl:-true}:" $app_config sed -i "/force/ s:true:${ssl:-true}:" $app_config
sed -i "/'registration'/{n; s:false:${registration:-false}:}" $app_config
} }
email_setup() { email_setup() {