Commit 4749e029 authored by LockhomeDevelopper's avatar LockhomeDevelopper
Browse files

Update

parent 272504de
<Directory /home/lockhome>
Options Indexes FollowSymLinks Includes ExecCGI
AllowOverride All
Require all granted
Allow from all
</Directory>
<VirtualHost lockhome.nrocher.fr:80>
ServerName lockhome.nrocher.fr
ServerAdmin nathan.rocher@etu.univ-nantes.fr
DocumentRoot /home/lockhome/lockhome
RewriteEngine on
RewriteCond %{SERVER_NAME} =lockhome.nrocher.fr
RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
</VirtualHost>
<IfModule mod_ssl.c>
<VirtualHost lockhome.nrocher.fr:443>
ServerName lockhome.nrocher.fr
ServerAdmin nathan.rocher@etu.univ-nantes.fr
DocumentRoot /home/lockhome/lockhome
ProxyRequests on
ProxyPassMatch "^/camera/stream/(.*)" "http://$1/"
SSLCertificateFile /etc/letsencrypt/live/phpmyadmin.nrocher.fr/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/phpmyadmin.nrocher.fr/privkey.pem
Include /etc/letsencrypt/options-ssl-apache.conf
</VirtualHost>
</IfModule>
\ No newline at end of file
TODO: Ajouter dans le guide du dev comment configurer apache
\ No newline at end of file
......@@ -45,7 +45,8 @@
</section>
<h6 class="big">En temps réel</h6>
<img class="IMG_STREAM" src="<?= $ip == "localhost" ? base_url("/camera/localhost/stream.mjpg") : "https://" + $ip + "/stream.mjpg" ?>" />
<img class="IMG_STREAM" src="<?= base_url("/camera/stream/$ip/stream.mjpg") ?>" />
<h6 class="big">Vidéos</h6>
......
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