From 2c075d279f61bf548e22b2715d82d58fc1f16f76 Mon Sep 17 00:00:00 2001 From: Bernhard Tittelbach Date: Wed, 9 Apr 2014 23:57:29 +0000 Subject: [PATCH] change hostname wuzzler to torwaechter --- bridge-old-sensors-zmq.py | 2 +- go/door_client_zmq/make_deploy.zsh | 2 +- go/door_daemon_zmq/make_deploy.zsh | 2 +- go/door_nick_lookup_zmq/make_deploy.zsh | 2 +- go/r3-eventbroker_zmq/make_deploy.zsh | 2 +- go/r3-netstatus/main.go | 4 ++-- go/r3-netstatus/make_deploy.zsh | 2 +- inject_presence.py | 2 +- listen_to_events.py | 2 +- play-sound-status.py | 2 +- sensorvalues-to-json-zmq.py | 4 ++-- switch-power.py | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bridge-old-sensors-zmq.py b/bridge-old-sensors-zmq.py index 459d854..6f065d1 100755 --- a/bridge-old-sensors-zmq.py +++ b/bridge-old-sensors-zmq.py @@ -245,7 +245,7 @@ else: zmqctx = zmq.Context() zmqctx.linger = 0 zmqpub = zmqctx.socket(zmq.PUB) -zmqpub.connect("tcp://wuzzler.realraum.at:4243") +zmqpub.connect("tcp://torwaechter.realraum.at:4243") #listen for sensor data and forward them trackSensorStatus(uwscfg, zmqpub) diff --git a/go/door_client_zmq/make_deploy.zsh b/go/door_client_zmq/make_deploy.zsh index f43a274..d239291 100644 --- a/go/door_client_zmq/make_deploy.zsh +++ b/go/door_client_zmq/make_deploy.zsh @@ -4,4 +4,4 @@ export CGO_ENABLED=1 go-linux-386 clean #go-linux-386 build #strip ${PWD:t} -go-linux-386 build -ldflags "-s" && rsync -v --progress ${PWD:t} wuzzler.realraum.at:/flash/tuer/ +go-linux-386 build -ldflags "-s" && rsync -v --progress ${PWD:t} torwaechter.realraum.at:/flash/tuer/ diff --git a/go/door_daemon_zmq/make_deploy.zsh b/go/door_daemon_zmq/make_deploy.zsh index f43a274..d239291 100644 --- a/go/door_daemon_zmq/make_deploy.zsh +++ b/go/door_daemon_zmq/make_deploy.zsh @@ -4,4 +4,4 @@ export CGO_ENABLED=1 go-linux-386 clean #go-linux-386 build #strip ${PWD:t} -go-linux-386 build -ldflags "-s" && rsync -v --progress ${PWD:t} wuzzler.realraum.at:/flash/tuer/ +go-linux-386 build -ldflags "-s" && rsync -v --progress ${PWD:t} torwaechter.realraum.at:/flash/tuer/ diff --git a/go/door_nick_lookup_zmq/make_deploy.zsh b/go/door_nick_lookup_zmq/make_deploy.zsh index f43a274..d239291 100644 --- a/go/door_nick_lookup_zmq/make_deploy.zsh +++ b/go/door_nick_lookup_zmq/make_deploy.zsh @@ -4,4 +4,4 @@ export CGO_ENABLED=1 go-linux-386 clean #go-linux-386 build #strip ${PWD:t} -go-linux-386 build -ldflags "-s" && rsync -v --progress ${PWD:t} wuzzler.realraum.at:/flash/tuer/ +go-linux-386 build -ldflags "-s" && rsync -v --progress ${PWD:t} torwaechter.realraum.at:/flash/tuer/ diff --git a/go/r3-eventbroker_zmq/make_deploy.zsh b/go/r3-eventbroker_zmq/make_deploy.zsh index f43a274..d239291 100644 --- a/go/r3-eventbroker_zmq/make_deploy.zsh +++ b/go/r3-eventbroker_zmq/make_deploy.zsh @@ -4,4 +4,4 @@ export CGO_ENABLED=1 go-linux-386 clean #go-linux-386 build #strip ${PWD:t} -go-linux-386 build -ldflags "-s" && rsync -v --progress ${PWD:t} wuzzler.realraum.at:/flash/tuer/ +go-linux-386 build -ldflags "-s" && rsync -v --progress ${PWD:t} torwaechter.realraum.at:/flash/tuer/ diff --git a/go/r3-netstatus/main.go b/go/r3-netstatus/main.go index cd880ed..143f62b 100644 --- a/go/r3-netstatus/main.go +++ b/go/r3-netstatus/main.go @@ -39,8 +39,8 @@ func init() { flag.StringVar(&xmpp_login_.pass, "xpass", "", "XMPP Bot Login Password") flag.StringVar(&xmpp_bot_authstring_, "xbotauth", "", "String that user use to authenticate themselves to the bot") flag.StringVar(&xmpp_state_save_dir_,"xstatedir","/flash/var/lib/r3netstatus/", "Directory to save XMPP bot state in") - flag.StringVar(&r3eventssub_port_, "eventsubport", "tcp://wuzzler.realraum.at:4244", "zmq address to subscribe r3events") - flag.StringVar(&brain_connect_addr_, "brainconnect", "tcp://wuzzler.realraum.at:4245", "address to ask about most recent stored events") + flag.StringVar(&r3eventssub_port_, "eventsubport", "tcp://torwaechter.realraum.at:4244", "zmq address to subscribe r3events") + flag.StringVar(&brain_connect_addr_, "brainconnect", "tcp://torwaechter.realraum.at:4245", "address to ask about most recent stored events") flag.BoolVar(&enable_syslog_, "syslog", false, "enable logging to syslog") flag.BoolVar(&enable_debug_, "debug", false, "enable debug output") flag.Parse() diff --git a/go/r3-netstatus/make_deploy.zsh b/go/r3-netstatus/make_deploy.zsh index f43a274..d239291 100644 --- a/go/r3-netstatus/make_deploy.zsh +++ b/go/r3-netstatus/make_deploy.zsh @@ -4,4 +4,4 @@ export CGO_ENABLED=1 go-linux-386 clean #go-linux-386 build #strip ${PWD:t} -go-linux-386 build -ldflags "-s" && rsync -v --progress ${PWD:t} wuzzler.realraum.at:/flash/tuer/ +go-linux-386 build -ldflags "-s" && rsync -v --progress ${PWD:t} torwaechter.realraum.at:/flash/tuer/ diff --git a/inject_presence.py b/inject_presence.py index aa695ad..22ea604 100755 --- a/inject_presence.py +++ b/inject_presence.py @@ -14,7 +14,7 @@ def sendR3Message(socket, structname, datadict): zmqctx = zmq.Context() zmqctx.linger = 0 zmqpub = zmqctx.socket(zmq.PUB) -zmqpub.connect("tcp://wuzzler.realraum.at:4243") +zmqpub.connect("tcp://torwaechter.realraum.at:4243") time.sleep(5) #listen for sensor data and forward them diff --git a/listen_to_events.py b/listen_to_events.py index 8be98e0..107a610 100755 --- a/listen_to_events.py +++ b/listen_to_events.py @@ -33,7 +33,7 @@ while True: zmqctx.linger = 0 zmqsub = zmqctx.socket(zmq.SUB) zmqsub.setsockopt(zmq.SUBSCRIBE, "") - zmqsub.connect("tcp://wuzzler.realraum.at:4244") + zmqsub.connect("tcp://torwaechter.realraum.at:4244") while True: diff --git a/play-sound-status.py b/play-sound-status.py index 151ce52..a60e0d6 100755 --- a/play-sound-status.py +++ b/play-sound-status.py @@ -87,7 +87,7 @@ class UWSConfig: self.config_parser.add_section('debug') self.config_parser.set('debug','enabled',"False") self.config_parser.add_section('broker') - self.config_parser.set('broker','uri',"tcp://wuzzler.realraum.at:4244") + self.config_parser.set('broker','uri',"tcp://torwaechter.realraum.at:4244") self.config_parser.add_section('tracker') self.config_parser.set('tracker','secs_movement_before_presence_to_launch_event','1') self.config_parser.set('tracker','secs_presence_before_movement_to_launch_event','120') diff --git a/sensorvalues-to-json-zmq.py b/sensorvalues-to-json-zmq.py index d6bc31e..2d42b54 100755 --- a/sensorvalues-to-json-zmq.py +++ b/sensorvalues-to-json-zmq.py @@ -45,8 +45,8 @@ class UWSConfig: self.config_parser.set('json','limit_list_len',"10000") self.config_parser.set('json','updateinterval',"30") self.config_parser.add_section('zmq') - self.config_parser.set('zmq','remote_uri',"tcp://wuzzler.realraum.at:4244") - self.config_parser.set('zmq','sshtunnel',"realraum@wuzzler.realraum.at:22000") + self.config_parser.set('zmq','remote_uri',"tcp://torwaechter.realraum.at:4244") + self.config_parser.set('zmq','sshtunnel',"realraum@torwaechter.realraum.at:22000") self.config_parser.set('zmq','sshkeyfile',"/home/guests/realraum.wirdorange.org/id_rsa") self.config_parser.set('zmq','subscribe',"TempSensorUpdate IlluminationSensorUpdate DustSensorUpdate RelativeHumiditySensorUpdate MovementSensorUpdate") self.config_parser.add_section('debug') diff --git a/switch-power.py b/switch-power.py index 9e036b3..94b0dee 100755 --- a/switch-power.py +++ b/switch-power.py @@ -47,7 +47,7 @@ class UWSConfig: self.config_parser.add_section('debug') self.config_parser.set('debug','enabled',"False") self.config_parser.add_section('broker') - self.config_parser.set('broker','uri',"tcp://wuzzler.realraum.at:4244") + self.config_parser.set('broker','uri',"tcp://torwaechter.realraum.at:4244") self.config_mtime=0 if not self.configfile is None: try: -- 1.7.10.4