Skip to content

Commit 0ee0c8b

Browse files
romkeyromkey
committed
Merge branch 'main' of github.com:romkey/pdxhackerspace-hackstack
2 parents 912ec45 + 6970596 commit 0ee0c8b

11 files changed

Lines changed: 199 additions & 17 deletions

‎.gitignore‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ avahi-dns/services
1313

1414
home-assistant/config/
1515

16-
mopidy/conf/mopidy.conf
17-
1816
redis/conf/
1917

2018
upsd/config/
@@ -39,6 +37,9 @@ zigbee2mqtt/data/log/
3937
# Patterns from backrest/.gitignore
4038
backrest/config/config.json*
4139

40+
# Patterns from mopidy/.gitignore
41+
mopidy/config/mopidy.conf
42+
4243
# Patterns from grafana/.gitignore
4344
grafana/config/grafana.ini
4445

‎.gitignore.initial‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ avahi-dns/services
1313

1414
home-assistant/config/
1515

16-
mopidy/conf/mopidy.conf
17-
1816
redis/conf/
1917

2018
upsd/config/

‎.rsync.exclude‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Do not edit .rsync.exclude
2+
# File is automatically built from .rsync.exclude.inital and */.rsync.exclude
3+
14
lost+found/
25
containerd/
36
docker/

‎.rsync.exclude.initial‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Do not edit .rsync.exclude
2+
# File is automatically built from .rsync.exclude.inital and */.rsync.exclude
3+
14
lost+found/
25
containerd/
36
docker/

‎mopidy/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
config/mopidy.conf

‎mopidy/config/mopidy.conf.example‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
[core]
2+
cache_dir = /app/cache
3+
config_dir = /config
4+
data_dir = /app
5+
6+
[logging]
7+
verbosity = 0
8+
format = %(levelname)-8s %(asctime)s [%(process)d:%(threadName)s] %(name)s\n %(message)s
9+
color = true
10+
config_file =
11+
12+
[audio]
13+
# output = alsasink # play through /dev/snd
14+
# output = pulsesink server=127.0.0.1:34567 # use local PulseAudio server (see https://docs.mopidy.com/en/latest/running/service/?highlight=pulseaudio#system-service-and-pulseaudio)
15+
# output = audioresample ! audioconvert ! audio/x-raw,rate=48000,channels=2,format=S16LE ! wavenc ! tcpclientsink host=<SNAPSERVER_IP> port=4955 # play to remote snapserver (see https://github.com/badaix/snapcast/blob/master/doc/configuration.md#tcp-server)
16+
mixer_volume = 80
17+
18+
[file]
19+
enabled = true
20+
media_dirs = /media
21+
show_dotfiles = false
22+
excluded_file_extensions =
23+
.bmp
24+
.cda
25+
.cue
26+
.db
27+
.directory
28+
.doc
29+
.docx
30+
.html
31+
.jpeg
32+
.jpg
33+
.lnk
34+
.log
35+
.m3u
36+
.m3u8
37+
.nfo
38+
.nmx
39+
.pdf
40+
.png
41+
.sfv
42+
.txt
43+
.url
44+
.zip
45+
follow_symlinks = false
46+
metadata_timeout = 1000
47+
48+
[local]
49+
library = sqlite
50+
scan_flush_threshold = 100
51+
media_dir = /media
52+
scan_timeout = 4000
53+
excluded_file_extensions =
54+
.bmp
55+
.cda
56+
.cue
57+
.db
58+
.directory
59+
.doc
60+
.docx
61+
.html
62+
.jpeg
63+
.jpg
64+
.lnk
65+
.log
66+
.m3u
67+
.m3u8
68+
.nfo
69+
.nmx
70+
.pdf
71+
.png
72+
.sfv
73+
.txt
74+
.url
75+
.zip
76+
77+
[m3u]
78+
#playlists_dir = /media/000-playlists
79+
80+
[mpd]
81+
enabled = true
82+
hostname = 0.0.0.0
83+
zeroconf = $hostname
84+
85+
[http]
86+
enabled = true
87+
hostname = 0.0.0.0
88+
port = 6680
89+
static_dir =
90+
zeroconf = $hostname
91+
92+
[scrobbler]
93+
#username = <username>
94+
#password = <password>
95+
96+
[tunein]
97+
timeout = 600000
98+
99+
[youtube]
100+
enabled = true
101+
102+
[ytmusic]
103+
enabled = false
104+
auth_json = /config/yt-auth.json
105+
106+
[tidal]
107+
enabled = false
108+
quality = LOSSLESS
109+
110+
[defaultplaylist]
111+
enabled = false
112+
defaultplaylist_name = play-on-start
113+
autoplay = true
114+
115+
[iris]
116+
country = us
117+
locale = en_US
118+
data_dir = /app/iris
119+
snapcast_enabled = true
120+
snapcast_host = localhost
121+
snapcast_port = 1780
122+
snapcast_stream = Default

‎mopidy/docker-compose.yml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,20 @@ services:
77
restart: unless-stopped
88
privileged: true
99
networks:
10-
- nginx-proxy-net
10+
- proxy
1111
- mdns
1212
volumes:
1313
- ../../lib/mopidy:/app:rw
14-
- /media/nas/music:/media
14+
- ../../run/mopidy:/app/cache
1515
- ./config:/config:ro
16-
- type: tmpfs
17-
target: /app/cache
18-
tmpfs:
19-
size: 128000000
20-
mode: 777
21-
user: mopidy:audio
16+
- /media/nas/music:/media
17+
user: 84044:audio
2218
ports:
2319
- 6600:6600
2420
- 6680:6680
2521

2622
networks:
27-
default:
23+
proxy:
2824
external: true
2925
name: nginx-proxy-net
3026
mdns:

‎netboot/docker-compose.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ services:
55
container_name: netbootxyz
66
environment:
77
- MENU_VERSION=2.0.47 # optional
8-
- NGINX_PORT=80 # optional
9-
- WEB_APP_PORT=3000 # optional
8+
- NGINX_PORT=3080 # optional
9+
- WEB_APP_PORT=3100 # optional
1010
volumes:
1111
- /opt/docker/netboot/data/config:/config # optional
1212
- /opt/docker/netboot/assets:/assets # optional
1313
ports:
14-
# - 3030:3000 # optional, destination should match ${WEB_APP_PORT} variable above.
14+
# - 3100:3000 # optional, destination should match ${WEB_APP_PORT} variable above.
1515
- 69:69/udp
16-
# - 8088:80 # optional, destination should match ${NGINX_PORT} variable above.
16+
# - 3188:80 # optional, destination should match ${NGINX_PORT} variable above.
1717
restart: unless-stopped
1818
networks:
1919
default:

‎rsyslog/.env.example‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
TZ=America/Los_Angeles

‎rsyslog/Dockerfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM alpine:latest
2+
3+
RUN apk --no-cache update && apk add --no-cache rsyslog tzdata
4+
5+
EXPOSE 514 514/udp
6+
7+
VOLUME [ "/var/log", "/etc/rsyslog.d" ]
8+
9+
# for some reason, the apk comes built with a v5
10+
# config file. using this one for v8:
11+
#COPY --from=src ./rsyslog.conf /etc/rsyslog.conf
12+
13+
ENTRYPOINT [ "rsyslogd", "-n" ]

0 commit comments

Comments
 (0)