Commit a43f183b authored by doodlemania's avatar doodlemania

touchups of stuff to make it slightly less brittle

parent 61290f95
......@@ -18,13 +18,14 @@ RUN rm /etc/apache2/sites-enabled/* \
&& sed -e 's,^ErrorLog.*,ErrorLog "/dev/stderr",' -i /etc/apache2/apache2.conf \
&& sed -e "s,MaxSpareServers[^:].*,MaxSpareServers 5," -i /etc/apache2/mods-available/mpm_prefork.conf \
&& a2disconf other-vhosts-access-log && a2enmod rewrite env proxy proxy_http proxy_wstunnel \
&& echo "Listen 8000" > /etc/apache2/ports.conf
ADD server.conf /app/code/spreed/server.conf
ADD janus.jcfg /etc/janus/janus.jcfg
ADD startup.sh /app/code/startup.sh
ADD apache2.conf /etc/apache2/sites-available/app.conf
RUN chmod +x /app/code/startup.sh
RUN chown -R www-data.www-data /app/code
&& echo "Listen 8000" > /etc/apache2/ports.conf
COPY server.conf /app/code/spreed/server.conf
COPY janus.jcfg /etc/janus/janus.jcfg
COPY startup.sh /app/code/startup.sh
COPY apache2.conf /etc/apache2/sites-available/app.conf
COPY mpm_prefork.conf /etc/apache2/mods-available/mpm_prefork.conf
RUN a2ensite app
RUN chmod +x /app/code/startup.sh
RUN chown -R www-data.www-data /app/code
CMD [ "/app/code/startup.sh" ]
#don't forget to set the turn server in janus.jcfg
#it's also in server.conf
#don't forget to set the turn server in janus.jcfg it's also in server.conf
<VirtualHost *:443>
# ... existing configuration ...
<VirtualHost *:8000>
# Enable proxying Websocket requests to the standalone signaling server.
ProxyPass "/standalone-signaling/" "ws://127.0.0.1:8080/"
......@@ -11,6 +9,15 @@
# Backend connections from Nextcloud.
RewriteRule ^/standalone-signaling/api/(.*) http://127.0.0.1:8080/api/$1 [L,P]
# ... existing configuration ...
<Location /healthcheck>
Order allow,deny
Allow from all
Satisfy Any
ErrorDocument 200 "ok"
RewriteEngine On
RewriteRule "/healthcheck" - [R=200]
</Location>
</VirtualHost>
<IfModule mpm_prefork_module>
# On startup, start these many servers
StartServers 2
# At any given time, keep atleast these many servers
MinSpareServers 2
# At any given time, keep atmost these many idle servers (this is always >= MinSpareServers+1)
MaxSpareServers 3
# Maximum number of servers at any given instant. Requests will be queued after this
MaxRequestWorkers 15
# Recycle process after handling these many requests. This protected against accidental memory leaks
MaxConnectionsPerChild 100
</IfModule>
......@@ -8,7 +8,7 @@ echo 'Startup nats in daemon mode'
/app/code/nats/nats-server &
sleep 5;
echo 'Starting signaling'
/app/code/spreed/bin/signaling &
cd /app/code/spreed && ./bin/signaling &
sleep 5;
echo "Starting apache..."
APACHE_CONFDIR="" source /etc/apache2/envvars
......
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