diff --git a/bitlair_closed.d/20_amplifier_poweroff b/bitlair_closed.d/20_amplifier_poweroff new file mode 100755 index 0000000..0b601d3 --- /dev/null +++ b/bitlair_closed.d/20_amplifier_poweroff @@ -0,0 +1,4 @@ +#!/bin/bash + +# Amplifier and KVM switch +apc-switch 22 off diff --git a/bitlair_closed.d/20_music_poweroff b/bitlair_closed.d/20_music_poweroff index 0e65474..fa787d0 100755 --- a/bitlair_closed.d/20_music_poweroff +++ b/bitlair_closed.d/20_music_poweroff @@ -3,9 +3,6 @@ ssh -o ConnectTimeout=1 root@music.bitlair.nl /opt/shutdown.sh ssh -o ConnectTimeout=1 root@music.bitlair.nl shutdown -h now sleep 10 -apc-switch 18 off - -# Amplifier and KVM switch -apc-switch 19 off +apc-switch 20 off mqtt-simple -r -h mqtt.bitlair.nl -p 'bitlair/music/space/state' -m 'stopped' diff --git a/bitlair_closed.d/21_bitpanel_poweroff b/bitlair_closed.d/21_bitpanel_poweroff index af9acfe..7fbd1a8 100755 --- a/bitlair_closed.d/21_bitpanel_poweroff +++ b/bitlair_closed.d/21_bitpanel_poweroff @@ -3,7 +3,4 @@ ssh root@bitpanel.bitlair.nl shutdown -h now sleep 10 -# 1 = Board (upper half) -# 2 = Controller -# 3 = Board (lower half) -powerbar-switch 1-3 off +apc-switch 18 off diff --git a/bitlair_closed.d/21_crossleds_poweroff b/bitlair_closed.d/21_crossleds_poweroff deleted file mode 100755 index 832d124..0000000 --- a/bitlair_closed.d/21_crossleds_poweroff +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -powerbar-switch 20 off diff --git a/bitlair_closed.d/21_lounge_leds_poweroff b/bitlair_closed.d/21_lounge_leds_poweroff new file mode 100755 index 0000000..fcf9cf8 --- /dev/null +++ b/bitlair_closed.d/21_lounge_leds_poweroff @@ -0,0 +1,3 @@ +#!/bin/bash + +apc-switch 17 off diff --git a/bitlair_closed.d/21_roofleds_poweroff b/bitlair_closed.d/21_roofleds_poweroff deleted file mode 100755 index 1844dec..0000000 --- a/bitlair_closed.d/21_roofleds_poweroff +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -powerbar-switch 4 off diff --git a/bitlair_closed.d/22_phone_off b/bitlair_closed.d/22_phone_off new file mode 100755 index 0000000..529d683 --- /dev/null +++ b/bitlair_closed.d/22_phone_off @@ -0,0 +1,2 @@ +#!/bin/bash +poe-switch 10 off diff --git a/bitlair_closed.d/23_bank_leds_off b/bitlair_closed.d/23_bank_leds_off new file mode 100755 index 0000000..22baa70 --- /dev/null +++ b/bitlair_closed.d/23_bank_leds_off @@ -0,0 +1,4 @@ +#!/bin/bash + +# Turn off the port for the bank leds +powerbar-switch 3 off diff --git a/bitlair_closed.d/23_beamer_off b/bitlair_closed.d/23_beamer_off new file mode 100755 index 0000000..7e3f0f0 --- /dev/null +++ b/bitlair_closed.d/23_beamer_off @@ -0,0 +1,4 @@ +#!/bin/bash + +# Turn off the port for the Beamer +powerbar-switch 2 off diff --git a/bitlair_closed.d/23_ledbanner_off b/bitlair_closed.d/23_ledbanner_off new file mode 100755 index 0000000..9faaf9c --- /dev/null +++ b/bitlair_closed.d/23_ledbanner_off @@ -0,0 +1,5 @@ +#!/bin/bash + +ssh -o ConnectTimeout=1 root@ledbanner.bitlair.nl shutdown -h now +sleep 10 +powerbar-switch 20 off diff --git a/bitlair_closed.d/24_statsbank_off b/bitlair_closed.d/24_statsbank_off new file mode 100755 index 0000000..cf36b76 --- /dev/null +++ b/bitlair_closed.d/24_statsbank_off @@ -0,0 +1,6 @@ +#!/bin/bash + +ssh -o ConnectTimeout=1 root@statsbak.bitlair.nl shutdown -h now +sleep 20 +powerbar-switch 19 off + diff --git a/bitlair_closed.d/80_twitter b/bitlair_closed.d/80_twitter index 1b31881..1ea0038 100755 --- a/bitlair_closed.d/80_twitter +++ b/bitlair_closed.d/80_twitter @@ -1,3 +1,3 @@ #!/bin/bash -bitlair-tweet "We closed at $(date +%s)" +bitlair-state-tweet "No, we're closed. Closed at: $(date --rfc-3339=seconds)" diff --git a/bitlair_open.d/20_amplifier_poweron b/bitlair_open.d/20_amplifier_poweron new file mode 100755 index 0000000..9c8f2df --- /dev/null +++ b/bitlair_open.d/20_amplifier_poweron @@ -0,0 +1,4 @@ +#!/bin/bash + +# Amplifier and KVM switch +apc-switch 22 on diff --git a/bitlair_open.d/20_bitpanel_poweron b/bitlair_open.d/20_bitpanel_poweron index b6f8dd2..5e8b291 100755 --- a/bitlair_open.d/20_bitpanel_poweron +++ b/bitlair_open.d/20_bitpanel_poweron @@ -1,9 +1,4 @@ #!/bin/bash -# Ensure the controller is power cycled. -powerbar-switch 2 off - -# 1 = Board (upper half) -# 2 = Controller -# 3 = Board (lower half) -powerbar-switch 1-3 on +# Turn on bitpanel +apc-switch 18 on diff --git a/bitlair_open.d/20_lounge_leds_poweron b/bitlair_open.d/20_lounge_leds_poweron new file mode 100755 index 0000000..b322505 --- /dev/null +++ b/bitlair_open.d/20_lounge_leds_poweron @@ -0,0 +1,4 @@ +#!/bin/bash + +# Turn on LEDs in the lounge +apc-switch 17 on diff --git a/bitlair_open.d/20_music_poweron b/bitlair_open.d/20_music_poweron index d279f74..9e4e068 100755 --- a/bitlair_open.d/20_music_poweron +++ b/bitlair_open.d/20_music_poweron @@ -1,8 +1,5 @@ #!/bin/bash -apc-switch 18 off +apc-switch 20 off # Switches on the music computer. -apc-switch 18 on - -# Amplifier and KVM switch -apc-switch 19 on +apc-switch 20 on diff --git a/bitlair_open.d/20_roofleds_poweron b/bitlair_open.d/20_roofleds_poweron deleted file mode 100755 index 65425c0..0000000 --- a/bitlair_open.d/20_roofleds_poweron +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -powerbar-switch 4 on diff --git a/bitlair_open.d/20_crossleds_poweron b/bitlair_open.d/21_ledbanner_on similarity index 63% rename from bitlair_open.d/20_crossleds_poweron rename to bitlair_open.d/21_ledbanner_on index 53d0ea3..9dd7ace 100755 --- a/bitlair_open.d/20_crossleds_poweron +++ b/bitlair_open.d/21_ledbanner_on @@ -1,3 +1,4 @@ #!/bin/bash +# Turn on ledbanner powerbar-switch 20 on diff --git a/bitlair_open.d/22_phone_on b/bitlair_open.d/22_phone_on new file mode 100755 index 0000000..f6ca1fe --- /dev/null +++ b/bitlair_open.d/22_phone_on @@ -0,0 +1,3 @@ +#!/bin/bash +poe-switch 10 on + diff --git a/bitlair_open.d/22_statsbak_on b/bitlair_open.d/22_statsbak_on new file mode 100755 index 0000000..4109393 --- /dev/null +++ b/bitlair_open.d/22_statsbak_on @@ -0,0 +1,4 @@ +#!/bin/bash + +# Turn on statsbak +powerbar-switch 19 on diff --git a/bitlair_open.d/23_beamer_on b/bitlair_open.d/23_beamer_on new file mode 100755 index 0000000..c1f41a1 --- /dev/null +++ b/bitlair_open.d/23_beamer_on @@ -0,0 +1,4 @@ +#!/bin/bash + +# Turn on the port for the Beamer +powerbar-switch 2 on diff --git a/bitlair_open.d/24_bank_leds_on b/bitlair_open.d/24_bank_leds_on new file mode 100755 index 0000000..040db5b --- /dev/null +++ b/bitlair_open.d/24_bank_leds_on @@ -0,0 +1,4 @@ +#!/bin/bash + +# Turn on the port for the bank leds +powerbar-switch 3 on diff --git a/bitlair_open.d/80_twitter b/bitlair_open.d/80_twitter index 53017a8..5d3633d 100755 --- a/bitlair_open.d/80_twitter +++ b/bitlair_open.d/80_twitter @@ -1,3 +1,3 @@ #!/bin/bash -bitlair-tweet "We OPENED at $(date +%s)" +bitlair-state-tweet "Yes, we're OPEN! Open since: $(date --rfc-3339=seconds)" diff --git a/djo_closed.d/20_amplifier_poweroff b/djo_closed.d/20_amplifier_poweroff new file mode 120000 index 0000000..3af0ba9 --- /dev/null +++ b/djo_closed.d/20_amplifier_poweroff @@ -0,0 +1 @@ +../bitlair_closed.d/20_amplifier_poweroff \ No newline at end of file diff --git a/djo_closed.d/20_music_poweroff b/djo_closed.d/20_music_poweroff deleted file mode 120000 index 08796cd..0000000 --- a/djo_closed.d/20_music_poweroff +++ /dev/null @@ -1 +0,0 @@ -../bitlair_closed.d/20_music_poweroff \ No newline at end of file diff --git a/djo_closed.d/21_crossleds_poweroff b/djo_closed.d/21_crossleds_poweroff deleted file mode 120000 index 307e1bd..0000000 --- a/djo_closed.d/21_crossleds_poweroff +++ /dev/null @@ -1 +0,0 @@ -../bitlair_closed.d/21_crossleds_poweroff \ No newline at end of file diff --git a/djo_closed.d/21_lounge_leds_poweroff b/djo_closed.d/21_lounge_leds_poweroff new file mode 120000 index 0000000..33e3bfb --- /dev/null +++ b/djo_closed.d/21_lounge_leds_poweroff @@ -0,0 +1 @@ +/opt/spacestate/bitlair_closed.d/21_lounge_leds_poweroff \ No newline at end of file diff --git a/djo_closed.d/21_roofleds_poweroff b/djo_closed.d/21_roofleds_poweroff deleted file mode 120000 index 47b06ca..0000000 --- a/djo_closed.d/21_roofleds_poweroff +++ /dev/null @@ -1 +0,0 @@ -../bitlair_closed.d/21_roofleds_poweroff \ No newline at end of file diff --git a/djo_closed.d/22_phone_off b/djo_closed.d/22_phone_off new file mode 120000 index 0000000..f0c67d1 --- /dev/null +++ b/djo_closed.d/22_phone_off @@ -0,0 +1 @@ +/opt/spacestate/bitlair_closed.d/22_phone_off \ No newline at end of file diff --git a/djo_closed.d/23_bank_leds_off b/djo_closed.d/23_bank_leds_off new file mode 120000 index 0000000..316d40f --- /dev/null +++ b/djo_closed.d/23_bank_leds_off @@ -0,0 +1 @@ +../bitlair_closed.d/23_bank_leds_off \ No newline at end of file diff --git a/djo_closed.d/23_beamer_off b/djo_closed.d/23_beamer_off new file mode 120000 index 0000000..5205ed9 --- /dev/null +++ b/djo_closed.d/23_beamer_off @@ -0,0 +1 @@ +../bitlair_closed.d/23_beamer_off \ No newline at end of file diff --git a/djo_closed.d/23_ledbanner_off b/djo_closed.d/23_ledbanner_off new file mode 120000 index 0000000..ea7af08 --- /dev/null +++ b/djo_closed.d/23_ledbanner_off @@ -0,0 +1 @@ +/opt/spacestate/bitlair_closed.d/23_ledbanner_off \ No newline at end of file diff --git a/djo_closed.d/24_statsbak_off b/djo_closed.d/24_statsbak_off new file mode 120000 index 0000000..9a7efc9 --- /dev/null +++ b/djo_closed.d/24_statsbak_off @@ -0,0 +1 @@ +/opt/spacestate/bitlair_closed.d/24_statsbank_off \ No newline at end of file diff --git a/djo_open.d/20_amplifier_poweron b/djo_open.d/20_amplifier_poweron new file mode 120000 index 0000000..7dd45be --- /dev/null +++ b/djo_open.d/20_amplifier_poweron @@ -0,0 +1 @@ +../bitlair_open.d/20_amplifier_poweron \ No newline at end of file diff --git a/djo_open.d/20_crossleds_poweron b/djo_open.d/20_crossleds_poweron deleted file mode 120000 index 634de70..0000000 --- a/djo_open.d/20_crossleds_poweron +++ /dev/null @@ -1 +0,0 @@ -../bitlair_open.d/20_crossleds_poweron \ No newline at end of file diff --git a/djo_open.d/20_lounge_leds_poweron b/djo_open.d/20_lounge_leds_poweron new file mode 120000 index 0000000..1ddbbb0 --- /dev/null +++ b/djo_open.d/20_lounge_leds_poweron @@ -0,0 +1 @@ +/opt/spacestate/bitlair_open.d/20_lounge_leds_poweron \ No newline at end of file diff --git a/djo_open.d/20_music_poweron b/djo_open.d/20_music_poweron deleted file mode 120000 index 7e9f8bd..0000000 --- a/djo_open.d/20_music_poweron +++ /dev/null @@ -1 +0,0 @@ -../bitlair_open.d/20_music_poweron \ No newline at end of file diff --git a/djo_open.d/20_roofleds_poweron b/djo_open.d/20_roofleds_poweron deleted file mode 120000 index c743c89..0000000 --- a/djo_open.d/20_roofleds_poweron +++ /dev/null @@ -1 +0,0 @@ -../bitlair_open.d/20_roofleds_poweron \ No newline at end of file diff --git a/djo_open.d/21_ledbanner_on b/djo_open.d/21_ledbanner_on new file mode 120000 index 0000000..d6443e2 --- /dev/null +++ b/djo_open.d/21_ledbanner_on @@ -0,0 +1 @@ +/opt/spacestate/bitlair_open.d/21_ledbanner_on \ No newline at end of file diff --git a/djo_open.d/22_phone_on b/djo_open.d/22_phone_on new file mode 120000 index 0000000..661c95e --- /dev/null +++ b/djo_open.d/22_phone_on @@ -0,0 +1 @@ +/opt/spacestate/bitlair_open.d/22_phone_on \ No newline at end of file diff --git a/djo_open.d/22_statsbak_on b/djo_open.d/22_statsbak_on new file mode 120000 index 0000000..0cea7f9 --- /dev/null +++ b/djo_open.d/22_statsbak_on @@ -0,0 +1 @@ +/opt/spacestate/bitlair_open.d/22_statsbak_on \ No newline at end of file diff --git a/djo_open.d/23_beamer_on b/djo_open.d/23_beamer_on new file mode 120000 index 0000000..a130d39 --- /dev/null +++ b/djo_open.d/23_beamer_on @@ -0,0 +1 @@ +../bitlair_open.d/23_beamer_on \ No newline at end of file diff --git a/djo_open.d/24_bank_leds_on b/djo_open.d/24_bank_leds_on new file mode 120000 index 0000000..1b312e7 --- /dev/null +++ b/djo_open.d/24_bank_leds_on @@ -0,0 +1 @@ +../bitlair_open.d/24_bank_leds_on \ No newline at end of file