Skip to content

Commit 80821d5

Browse files
Merge branch 'master' into feature/AddZigbee2MqttAssistant
2 parents 2ce8172 + 7689228 commit 80821d5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1530
-193
lines changed

.github/workflows/main.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Publish docs via GitHub Pages
2+
on:
3+
push:
4+
branches:
5+
- master
6+
7+
jobs:
8+
build:
9+
name: Deploy docs
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout master
13+
uses: actions/checkout@v1
14+
15+
- name: Deploy docs
16+
uses: mhausenblas/mkdocs-deploy-gh-pages@master
17+
env:
18+
PERSONAL_TOKEN: ${{ secrets.PERSONAL_TOKEN }}

.templates/gitea/gitea.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# initially empty

.templates/gitea/service.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
gitea:
2+
container_name: gitea
3+
image: kapdap/gitea-rpi
4+
restart: unless-stopped
5+
user: "0"
6+
ports:
7+
- "7920:3000/tcp"
8+
- "2222:22/tcp"
9+
env_file:
10+
- ./services/gitea/gitea.env
11+
volumes:
12+
- ./volumes/gitea/data:/data
13+
- /etc/timezone:/etc/timezone:ro
14+
- /etc/localtime:/etc/localtime:ro

.templates/mosquitto/filter.acl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
user admin
2+
topic read #
3+
topic write #
4+
5+
pattern read #
6+
pattern write #

.templates/mosquitto/mosquitto.conf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
persistence true
22
persistence_location /mosquitto/data/
33
log_dest file /mosquitto/log/mosquitto.log
4+
5+
#Uncomment to enable passwords
46
#password_file /mosquitto/config/pwfile
7+
#allow_anonymous false
8+
9+
#Uncomment to enable filters
10+
#acl_file /mosquitto/config/filter.acl

.templates/mosquitto/service.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@
1010
- ./volumes/mosquitto/data:/mosquitto/data
1111
- ./volumes/mosquitto/log:/mosquitto/log
1212
- ./services/mosquitto/mosquitto.conf:/mosquitto/config/mosquitto.conf
13+
- ./services/mosquitto/filter.acl:/mosquitto/config/filter.acl
1314

.templates/python/directoryfix.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22

33
# Directoryfix for python
44

5+
#current user
6+
u=$(whoami)
7+
58
if [ ! -d ./volumes/python/app ]; then
69
sudo mkdir -p ./volumes/python/app
7-
sudo chown -R pi:pi ./volumes/python
10+
sudo chown -R $u:$u ./volumes/python
811
echo 'print("hello world")' >./volumes/python/app/app.py
912

1013
fi

.templates/transmission/build.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
# create directories for named volumes
4+
TRANSMISSION_BASEDIR=.volumes/transmission
5+
mkdir -p $TRANSMISSION_BASEDIR/downloads
6+
mkdir -p $TRANSMISSION_BASEDIR/watch
7+
mkdir -p $TRANSMISSION_BASEDIR/config

.templates/transmission/service.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
transmission:
2+
image: linuxserver/transmission
3+
container_name: transmission
4+
environment:
5+
- PUID=1000
6+
- PGID=1000
7+
- TZ=Europe/Rome
8+
volumes:
9+
- transm_config_volume:/config
10+
- transm_download_volume:/downloads
11+
- transm_watch_volume:/watch
12+
ports:
13+
- 9091:9091
14+
- 51413:51413
15+
- 51413:51413/udp
16+
restart: unless-stopped

.templates/transmission/volumes.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
2+
transm_download_volume:
3+
driver: local
4+
driver_opts:
5+
o: bind
6+
type: none
7+
device: .volumes/transmission/downloads
8+
9+
transm_watch_volume:
10+
driver: local
11+
driver_opts:
12+
o: bind
13+
type: none
14+
device: .volumes/transmission/watch
15+
16+
transm_config_volume:
17+
driver: local
18+
driver_opts:
19+
o: bind
20+
type: none
21+
device: .volumes/transmission/config

0 commit comments

Comments
 (0)