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
16349da5
Commit
16349da5
authored
Dec 29, 2016
by
Michał 'rysiek' Woźniak
Browse files
more to the name change
parent
c859f247
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
Dockerfile
Dockerfile
+1
-1
entrypoint.sh
entrypoint.sh
+5
-5
No files found.
Dockerfile
View file @
16349da5
...
...
@@ -15,7 +15,7 @@ RUN git clone https://git.codecoop.org/schleuder/schleuder-web.git /opt/schleude
bin/setup
# remove the default config files
RUN
rm
/opt/schleuder-web/config/
web
schleuder.yml /opt/schleuder-web/config/secrets.yml /opt/schleuder-web/config/database.yml
RUN
rm
/opt/schleuder-web/config/schleuder
-web
.yml /opt/schleuder-web/config/secrets.yml /opt/schleuder-web/config/database.yml
COPY
entrypoint.sh /sbin/entrypoint.sh
RUN
chmod
a+x /sbin/entrypoint.sh
...
...
entrypoint.sh
View file @
16349da5
...
...
@@ -140,9 +140,9 @@ fi
#
# create the webschlocker config file, if it doesn't exist
# see: https://git.codecoop.org/schleuder/schleuder-web/blob/master/config/
web
schleuder.yml
if
[
!
-e
"
$WEBSCHLOCKER_CONFIG_DIR
/
web
schleuder.yml"
]
;
then
echo
"+-- no config file found in '
$WEBSCHLOCKER_CONFIG_DIR
/
web
schleuder.yml', creating one..."
# see: https://git.codecoop.org/schleuder/schleuder-web/blob/master/config/schleuder
-web
.yml
if
[
!
-e
"
$WEBSCHLOCKER_CONFIG_DIR
/schleuder
-web
.yml"
]
;
then
echo
"+-- no config file found in '
$WEBSCHLOCKER_CONFIG_DIR
/schleuder
-web
.yml', creating one..."
# hopefully the unneeded settings will be ignored ;)
# For delivery_method, sendmail_settings and smtp_settings see
...
...
@@ -164,9 +164,9 @@ production:
port:
$WEBSCHLOCKER_CONFIG_SMTP_PORT
#openssl_verify_mode:
$WEBSCHLOCKER_CONFIG_OPENSSL_VERIFY_MODE
"
echo
-e
"
$WEBSCHLOCKER_CONFIG
"
>
"
$WEBSCHLOCKER_CONFIG_DIR
/
web
schleuder.yml"
echo
-e
"
$WEBSCHLOCKER_CONFIG
"
>
"
$WEBSCHLOCKER_CONFIG_DIR
/schleuder
-web
.yml"
else
echo
"+-- config file found in '
$WEBSCHLOCKER_CONFIG_DIR
/
web
schleuder.yml', ignoring
\$
WEBSCHLOCKER_CONFIG_* envvars"
echo
"+-- config file found in '
$WEBSCHLOCKER_CONFIG_DIR
/schleuder
-web
.yml', ignoring
\$
WEBSCHLOCKER_CONFIG_* envvars"
fi
...
...
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