Fix merge conflicts

This commit is contained in:
David Stephens 2019-06-26 22:44:19 +01:00
commit 0190d1c4e5
7 changed files with 63 additions and 2 deletions

View file

@ -45,6 +45,7 @@ Ansible config and a bunch of Docker containers.
* [Jackett](https://github.com/Jackett/Jackett) - API Support for your favorite torrent trackers
* [MiniDlna](https://sourceforge.net/projects/minidlna/) - simple media server which is fully compliant with DLNA/UPnP-AV clients
* [Miniflux](https://miniflux.app/) - An RSS news reader
* [Mosquitto](https://mosquitto.org) - An open source MQTT broker
* [MyMediaForAlexa](https://www.mymediaalexa.com/) - Lets you stream your music collection to your alexa device
* [Netdata](https://my-netdata.io/) - An extremely comprehensive system monitoring solution
* [Nextcloud](https://nextcloud.com/) - A self-hosted Dropbox alternative

View file

@ -0,0 +1,10 @@
# Mosquitto
Homepage: [https://mosquitto.org](https://mosquitto.org)
Mosquitto is a lightweight open source MQTT message broker.
## Usage
Set `mosquitto_enabled: true` in your `group_vars/all.yml` file.

View file

@ -21,6 +21,8 @@ By default, applications can be found on the ports listed below.
| Jackett | 9117 | |
| MiniDLNA | 8201 | |
| Miniflux | 8070 | |
| Mosquitto | 1883 | MQTT |
| Mosquitto | 9001 | Websocket |
| MyMediaForAlexa | 52051 | |
| Netdata | 19999 | |
| Nextcloud | 8080 | |

View file

@ -74,6 +74,9 @@ firefly_enabled: false
# Wallabag
wallabag_enabled: false
# MQTT
mosquitto_enabled: false
###
### General
###
@ -563,4 +566,9 @@ nzbget_group_id: 0
### Wallabag
###
wallabag_available_externally: "false"
wallabag_data_directory: "{{ docker_home }}/wallabag"
wallabag_data_directory: "{{ docker_home }}/wallabag"
### Mosquitto
###
mosquitto_available_externally: "false"
mosquitto_data_directory: "{{ docker_home }}/mosquitto"

View file

@ -166,4 +166,8 @@
- import_tasks: tasks/wallabag.yml
when: (wallabag_enabled | default(False))
tags: wallabag
tags: wallabag
- import_tasks: tasks/mosquitto.yml
when: (mosquitto_enabled | default(False))
tags: mosquitto

32
tasks/mosquitto.yml Normal file
View file

@ -0,0 +1,32 @@
- name: Create Mosquitto Directories
file:
path: "{{ item }}"
state: directory
with_items:
- "{{ mosquitto_data_directory }}/config"
- "{{ mosquitto_data_directory }}/data"
- "{{ mosquitto_data_directory }}/log"
- name: Template mosquitto.conf
template:
src: mosquitto/mosquitto.conf
dest: "{{ mosquitto_data_directory }}/config/mosquitto.conf"
- name: Create Mosquitto container
docker_container:
name: mosquitto
image: eclipse-mosquitto:latest
pull: true
volumes:
- "{{ mosquitto_data_directory }}:/config:rw"
- "{{ mosquitto_data_directory }}:/data:rw"
- "{{ mosquitto_data_directory }}:/log:rw"
env:
PUID: 1311
PGID: 1311
TZ: "{{ ansible_nas_timezone }}"
ports:
- "1883:1883"
- "9001:9001"
restart_policy: unless-stopped
memory: 1g

View file

@ -0,0 +1,4 @@
persistence true
persistence_location /mosquitto/data/
log_dest file /mosquitto/log/mosquitto.log