simon
/
Docker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into refactor_docker

This commit is contained in:
Simon Milvert 2020-08-13 21:09:00 +02:00
parent fc41a56667 a79a034b28
commit a5c26d09ed
5 changed files with 83 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker-compose.yml
View File

@ -16,6 +16,9 @@ services:
- 8384:8384 - 8384:8384
- 22000:22000 - 22000:22000
- 21027:21027/udp - 21027:21027/udp
networks:
- frontend
- backend
restart: unless-stopped restart: unless-stopped
milvert-nginx: milvert-nginx:
@ -56,7 +59,7 @@ services:
- TZ=Europe/Stockholm - TZ=Europe/Stockholm
gitea: gitea:
image: gitea/gitea:1.9.3 image: gitea/gitea:1.12
container_name: gitea container_name: gitea
networks: networks:
- backend - backend
@ -109,7 +112,9 @@ services:
- PGID=1000 - PGID=1000
- TZ=Europe/Stockholm - TZ=Europe/Stockholm
volumes: volumes:
- ./mosquitto/mosquitto.conf:/mosquitto/config/mosquitto.conf - ./mosquitto/mosquitto.conf:/mqtt/mosquitto.conf
- ${DIR}/mqtt/data:/mqtt/data
- ${DIR}/mqtt/log:/mqtt/log
labels: labels:
- "traefik.http.routers.mqtt.rule=Host(`mqtt.${DOMAIN}`)" - "traefik.http.routers.mqtt.rule=Host(`mqtt.${DOMAIN}`)"
- "traefik.http.routers.mqtt.entrypoints=mqtt" - "traefik.http.routers.mqtt.entrypoints=mqtt"

17
mosquitto/mosquitto.conf
View File

@ -1,7 +1,18 @@
persistence true pid_file /var/run/mosquitto.pid
persistence_location /mosquitto/data/
log_dest file /mosquitto/log/mosquitto.log
persistence true
persistence_location /mqtt/data/
user mosquitto
# Port to use for the default listener.
port 1883
log_dest file /mqtt/log/mosquitto.log
log_dest stdout
include_dir /mqtt/config
listener 1883 listener 1883

15
web/milvert.com/conf/milvert.com.conf Normal file
View File

@ -0,0 +1,15 @@
server {
server_name milvert.com www.milvert.com;
root /html;
error_log /var/log/nginx/milvert.com.error.log;
access_log /var/log/nginx/milvert.com.access.log;
listen 80 default_server;
listen [::]:80 default_server;
}

47
web/milvert.com/html/index.html Executable file
View File

@ -0,0 +1,47 @@
<html>
<head>
<title>milvert.com</title>
<meta name="google-site-verification" content="QAr7wTVWOBHuNIQyz_xkhAZ6ja8KhW8Zw7MU7ygZMoE" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta http-equiv="Imagetoolbar" content="no">
<style type="text/css">
/* pushes the page to the full capacity of the viewing area */
html {height:100%;}
body {height:100%; margin:0; padding:0;}
/* prepares the background image to full capacity of the viewing area */
#bg {position:fixed; top:0; left:0; ; height:100%;}
/* places the content ontop of the background image */
#content {position:relative; z-index:1;}
</style>
<!--[if IE 6]>
<style type="text/css">
/* some css fixes for IE browsers */
html {overflow-y:hidden;}
body {overflow-y:auto;}
#bg {position:absolute; z-index:-1;}
#content {position:static;}
</style>
<![endif]-->
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-28178678-1']);
_gaq.push(['_setDomainName', 'milvert.com']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
</head>
<body>
<div id="bg"><img src="web.jpg" height="100%" alt=""></div>
</body>
</html>

BIN
web/milvert.com/html/web.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 333 KiB