Commit 8a4fd1c7 authored by totalreset's avatar totalreset
Browse files

Merge branch 'master' of 185.52.224.4:sms/nomasters-radio

parents 4d2f0075 3a6fe6e5
......@@ -2,14 +2,14 @@
version: 5
defaults:
datadir: "hiera"
datadir: "hiera"
hierarchy:
- name: 'Yaml backend'
- name: 'Yaml backend'
data_hash: yaml_data
paths:
- 'puppetapply.yaml'
- "nodes/%{facts.hostname}.yaml"
- 'common.yaml'
- "/etc/puppet/private/nodes/%{facts.hostname}.yaml"
- '/etc/puppet/private/common.yaml'
- 'puppetapply.yaml'
- "nodes/%{facts.hostname}.yaml"
- 'common.yaml'
- "/etc/puppet/private/nodes/%{facts.hostname}.yaml"
- '/etc/puppet/private/common.yaml'
---
#sms::audio::jack_cmdline: "-T -ndefault -T -d alsa"
# sms::audio::jack_cmdline: "-T -ndefault -T -d alsa"
sms::audio::glwritetoken: "zG-cLsYz7F27qeqpByV-"
sms::audio::ircprefix: "tst"
#sms::audio::liqfile: 'papillon-ls1ls2-low.liq'
# sms::audio::liqfile: 'papillon-ls1ls2-low.liq'
sms::bot::ircprefix: "tst"
sms::bot::channels: "#lag"
put::defaultdisplay: ':0'
sms::streamingserver::icecast_password: "hackme"
......@@ -2,7 +2,3 @@
sms::audio::glwritetoken: "lalala"
sms::audio::ircprefix: "lalala"
Subproject commit 493197fc5386d0b057cc4cf2f86cd3a6131dbe3d
Subproject commit aad317f8ce1ca3451189ff06ace11ec90919da1d
Subproject commit 2509d17ccb2504dafae806ba616d6bfd436b44a8
Subproject commit 2fafe783ce1c477060de1ab4cb7d56d7d2396e62
Subproject commit 13ece6b14033d9defdddec3c3535568f58bb1750
Subproject commit 74946be5552028855d5e9197a0942b5f463368d0
Subproject commit 00f4c3b119497d47f0f45a11ac9c841dedb58d99
Subproject commit 884fc0a124ebce6c59a93d87207fb46751c09715
Subproject commit c573890e4dc46f65fb171b0fcb4d61eb3ba1d65a
Subproject commit 5e329d8bddc548257647fd15826c43d51d6330ae
Subproject commit 526d52f264c9999310f97a83c9171fb6033045ee
Subproject commit 36c18ffdb3ecf86c575eaaeb8584c9f9abcf4f77
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment