Commit 16349da5 authored by Michał 'rysiek' Woźniak's avatar Michał 'rysiek' Woźniak
Browse files

more to the name change

parent c859f247
...@@ -15,7 +15,7 @@ RUN git clone https://git.codecoop.org/schleuder/schleuder-web.git /opt/schleude ...@@ -15,7 +15,7 @@ RUN git clone https://git.codecoop.org/schleuder/schleuder-web.git /opt/schleude
bin/setup bin/setup
# remove the default config files # remove the default config files
RUN rm /opt/schleuder-web/config/webschleuder.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 COPY entrypoint.sh /sbin/entrypoint.sh
RUN chmod a+x /sbin/entrypoint.sh RUN chmod a+x /sbin/entrypoint.sh
......
...@@ -140,9 +140,9 @@ fi ...@@ -140,9 +140,9 @@ fi
# #
# create the webschlocker config file, if it doesn't exist # create the webschlocker config file, if it doesn't exist
# see: https://git.codecoop.org/schleuder/schleuder-web/blob/master/config/webschleuder.yml # see: https://git.codecoop.org/schleuder/schleuder-web/blob/master/config/schleuder-web.yml
if [ ! -e "$WEBSCHLOCKER_CONFIG_DIR/webschleuder.yml" ]; then if [ ! -e "$WEBSCHLOCKER_CONFIG_DIR/schleuder-web.yml" ]; then
echo "+-- no config file found in '$WEBSCHLOCKER_CONFIG_DIR/webschleuder.yml', creating one..." echo "+-- no config file found in '$WEBSCHLOCKER_CONFIG_DIR/schleuder-web.yml', creating one..."
# hopefully the unneeded settings will be ignored ;) # hopefully the unneeded settings will be ignored ;)
# For delivery_method, sendmail_settings and smtp_settings see # For delivery_method, sendmail_settings and smtp_settings see
...@@ -164,9 +164,9 @@ production: ...@@ -164,9 +164,9 @@ production:
port: $WEBSCHLOCKER_CONFIG_SMTP_PORT port: $WEBSCHLOCKER_CONFIG_SMTP_PORT
#openssl_verify_mode: $WEBSCHLOCKER_CONFIG_OPENSSL_VERIFY_MODE #openssl_verify_mode: $WEBSCHLOCKER_CONFIG_OPENSSL_VERIFY_MODE
" "
echo -e "$WEBSCHLOCKER_CONFIG" > "$WEBSCHLOCKER_CONFIG_DIR/webschleuder.yml" echo -e "$WEBSCHLOCKER_CONFIG" > "$WEBSCHLOCKER_CONFIG_DIR/schleuder-web.yml"
else else
echo "+-- config file found in '$WEBSCHLOCKER_CONFIG_DIR/webschleuder.yml', ignoring \$WEBSCHLOCKER_CONFIG_* envvars" echo "+-- config file found in '$WEBSCHLOCKER_CONFIG_DIR/schleuder-web.yml', ignoring \$WEBSCHLOCKER_CONFIG_* envvars"
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment