Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
libre
webschlocker3
Commits
0cf129eb
Commit
0cf129eb
authored
Apr 22, 2016
by
Michał 'rysiek' Woźniak
Browse files
bugfixes
parent
0be2638c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
6 deletions
+14
-6
entrypoint.sh
entrypoint.sh
+14
-6
No files found.
entrypoint.sh
View file @
0cf129eb
...
...
@@ -44,8 +44,8 @@ function abort {
[
-z
${
WEBSCHLOCKER_SECRET_KEY_BASE
+x
}
]
&&
WEBSCHLOCKER_SECRET_KEY_BASE
=
"
$(
echo
$RANDOM
|
sha256sum
|
sed
-r
-e
's/\s+-//'
)$(
echo
$RANDOM
|
sha256sum
|
sed
-r
-e
's/\s+-//'
)
"
# only internal use for the time being
WEBSCHLOCKER_CONFIG_DIR
=
"/opt/webschl
ock
er3/config
/
"
WEBSCHLOCKER_CONFIG_DIR
=
"/opt/webschl
eud
er3/config"
WEBSCHLOCKER_LOG_DIR
=
"/opt/webschleuder3/log"
#
# inform
echo
"+-- working with:"
...
...
@@ -59,7 +59,7 @@ echo " +-- WEBSCHLOCKER_BIND_PORT : $WEBSCHLOCKER_BIND_PORT"
#
# let's make sure we're not running as root, shall we?
if
[
$WEBSCHLOCKER_UID
==
0
]
||
[
$WEBSCHLOCKER_USER
==
'
root
'
]
||
[
$WEBSCHLOCKER_GID
==
0
]
||
[
$WEBSCHLOCKER_GROUP
==
'
root
'
]
;
then
if
[
"
$WEBSCHLOCKER_UID
"
==
"0"
]
||
[
"
$WEBSCHLOCKER_USER
"
==
"
root
"
]
||
[
"
$WEBSCHLOCKER_GID
"
==
"0"
]
||
[
"
$WEBSCHLOCKER_GROUP
"
==
"
root
"
]
;
then
echo
echo
"* * * ERROR: trying to run as root -- I cannot let you do that, Dave!"
echo
...
...
@@ -186,8 +186,9 @@ production:
echo
-e
"
$WEBSCHLOCKER_DATABASE
"
>
"
$WEBSCHLOCKER_CONFIG_DIR
/database.yml"
# when using sqlite, let's make sure the database directory is accessible/writable for the user
if
[
$WEBSCHLOCKER_DB_ADAPTER
==
'sqlite3'
]
;
then
chown
-R
"
$WEBSCHLOCKER_USER
:
$WEBSCHLOCKER_GROUP
"
"
$(
basename
"
$WEBSCHLOCKER_DB_DATABASE
"
)
"
if
[
"
$WEBSCHLOCKER_DB_ADAPTER
"
==
"sqlite3"
]
;
then
mkdir
-p
"
$(
dirname
"
$WEBSCHLOCKER_DB_DATABASE
"
)
"
chown
-R
"
$WEBSCHLOCKER_USER
:
$WEBSCHLOCKER_GROUP
"
"
$(
dirname
"
$WEBSCHLOCKER_DB_DATABASE
"
)
"
fi
else
echo
"+-- database config file found in '
$WEBSCHLOCKER_CONFIG_DIR
/database.yml', ignoring
\$
WEBSCHLOCKER_DB_* envvars"
...
...
@@ -207,8 +208,15 @@ else
echo
"+-- secrets file found in '
$WEBSCHLOCKER_CONFIG_DIR
/secrets.yml', ignoring
\$
WEBSCHLOCKER_SECRET_KEY_BASE* envvar"
fi
#
# logfile
echo
"+-- creating and setting permissions on the log directory '
$WEBSCHLOCKER_LOG_DIR
'"
mkdir
-p
"
$WEBSCHLOCKER_LOG_DIR
"
chown
-R
"
$WEBSCHLOCKER_USER
:
$WEBSCHLOCKER_GROUP
"
"
$WEBSCHLOCKER_LOG_DIR
"
# prep the database (as the correct user)
exec
su
-p
-c
"env PATH=
\"
$PATH
\"
bundle exec rake db:setup RAILS_ENV=production"
"
$WEBSCHLOCKER_USER
"
echo
"+-- setting up the database"
su
-p
-c
"env PATH=
\"
$PATH
\"
bundle exec rake db:setup RAILS_ENV=production"
"
$WEBSCHLOCKER_USER
"
echo
"+-- executing:"
echo
"
$*
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment