Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Lockhome
LockHome
Commits
4749e029
Commit
4749e029
authored
Feb 17, 2020
by
LockhomeDevelopper
Browse files
Update
parent
272504de
Changes
3
Hide whitespace changes
Inline
Side-by-side
CONFIGURATION_APACHE
0 → 100644
View file @
4749e029
<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
README.md
View file @
4749e029
TODO: Ajouter dans le guide du dev comment configurer apache
\ No newline at end of file
application/views/camera/view.php
View file @
4749e029
...
...
@@ -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>
...
...
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