diff --git a/config/initializers/mozo_settings.rb b/config/initializers/mozo_settings.rb index d8c8c734..61041b32 100644 --- a/config/initializers/mozo_settings.rb +++ b/config/initializers/mozo_settings.rb @@ -1,7 +1,7 @@ if Rails.env.development? Qwaiter.event_host = "http://localhost:9296/faye" else - Qwaiter.event_host = "https://events.mozo.bar:9296/faye" + Qwaiter.event_host = "https://events.mozo.bar/faye" end Qwaiter.broadcaster = Qwaiter::Broadcaster::Faye.new diff --git a/faye/Dockerfile b/faye/Dockerfile index 8846b39d..1ed0b29d 100644 --- a/faye/Dockerfile +++ b/faye/Dockerfile @@ -33,9 +33,9 @@ COPY faye/Gemfile /usr/src/app/ RUN bundle install COPY ./faye /usr/src/app -RUN cp /usr/src/app/ssl/rootCA.pem /etc/ssl/certs/mozo-ssl-rootCA.pem -RUN cp /usr/src/app/ssl/fullchain.pem /etc/ssl/certs/mozo-ssl-fullchain.pem -RUN update-ca-certificates +#RUN cp /usr/src/app/ssl/rootCA.pem /etc/ssl/certs/mozo-ssl-rootCA.pem +#RUN cp /usr/src/app/ssl/fullchain.pem /etc/ssl/certs/mozo-ssl-fullchain.pem +#RUN update-ca-certificates ENV FAYE_PORT=9296 EXPOSE $FAYE_PORT @@ -44,4 +44,5 @@ EXPOSE $FAYE_PORT #CMD thin start -R config.ru -p $FAYE_PORT --ssl --ssl-disable-verify #CMD falcon serve --port $FAYE_PORT #CMD passenger start --port $FAYE_PORT --ssl --ssl-certificate ssl/fullchain.pem --ssl-certificate-key ssl/privkey.pem -CMD thin start -R config.ru -p $FAYE_PORT --ssl --ssl-disable-verify --ssl-key-file=ssl/privkey.pem --ssl-cert-file=ssl/fullchain.pem +#CMD thin start -R config.ru -p $FAYE_PORT --ssl --ssl-disable-verify --ssl-key-file=ssl/privkey.pem --ssl-cert-file=ssl/fullchain.pem +CMD thin start -R config.ru -p $FAYE_PORT