←︎ tools :: 4baa2a5

commit 4baa2a56ecc4b338744f59e9c43664fbb5fec81e

Author: acidvegas <acid.vegas@acid.vegas>

Date:   Mon Aug 19 20:45:13 2019 -0400

    update

---

 deploy-anope      | 13 ++++++-------

 deploy-unrealircd | 49 ++++++++++++++++++++++++++-----------------------

 monitor           |  2 +-

 startbots         | 13 ++++++++-----

 4 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/deploy-anope b/deploy-anope

index beffeb2..477d08c 100755

--- a/deploy-anope

+++ b/deploy-anope

@@ -1,20 +1,21 @@

 #!/bin/sh

 set -xev

+CURRENT='2.0.6'

 ANOPE=$HOME/services

 BACKUP=$HOME/services.backup

 SOURCE=$HOME/services.source

-setup() {

-	git clone --depth 1 https://github.com/supernets/anope.git $SOURCE

-	cd $SOURCE && $SOURCE/Config -nointro -quick && make && make install && cd $HOME && rm -rf $SOURCE

-}

-

 deploy() {

 	setup

 	#todo: edit services.conf here

 }

+setup() {

+	git clone --depth 1 https://github.com/supernets/anope.git $SOURCE

+	cd $SOURCE && $SOURCE/Config -nointro -quick && make && make install && cd $HOME && rm -rf $SOURCE

+}

+

 update() {

 	[ ! -z $(screen -ls | grep ircdwatchdog) ] && screen -S ircdwatchdog -X quit #todo: check & kill abduco watchdog process

 	mkdir $BACKUP

@@ -33,8 +34,6 @@ watchdog() {

 		abduco -fnr ircdwatchdog     bash -c "while true; do [ ! -f $HOME/services/data/services.pid ] && $HOME/services/bin/services; sleep 15; done"

 	elif command -v screen >/dev/null 2>&1; then

 		screen -S   ircdwatchdog -dm bash -c "while true; do [ ! -f $HOME/services/data/services.pid ] && $HOME/services/bin/services; sleep 15; done"

-	else

-		echo "[!] - install abduco or screen"

 	fi

 }

diff --git a/deploy-unrealircd b/deploy-unrealircd

index ab75880..49831d4 100755

--- a/deploy-unrealircd

+++ b/deploy-unrealircd

@@ -1,28 +1,10 @@

 #!/bin/sh

 set -xev

+CURRENT='4.2.4.1'

+BACKUP=$HOME/unrealircd.backup

+SOURCE=$HOME/unrealircd.source

 UNREAL=$HOME/unrealircd

-BACKUP=$UNREAL.backup

-SOURCE=$UNREAL.source

-

-#LATEST=$(curl -s https://www.unrealircd.org/downloads/list.json | sed -e 's/[{}]/''/g' | awk -v RS=',"' -F: '/^version/ {print $2}' | sed 's/\(^"\|"$\)//g')

-

-update_source() {

-	wget -O $SOURCE.tar.gz https://www.unrealircd.org/downloads/unrealircd-latest.tar.gz

-	tar -xvf $SOURCE.tar.gz --one-top-level --strip-components=1

-	rm $SOURCE.tar.gz

-	sed -i 's/NICKNAMEHISTORYLENGTH="2000"/NICKNAMEHISTORYLENGTH="100"/g' $SOURCE/Config

-	sed -i 's/REMOTEINC=""/REMOTEINC="1"/g' $SOURCE/Config

-	sed -i 's/PREFIXAQ="1"/PREFIXAQ="0"/g' $SOURCE/Config

-	sed -i 's/SHOWLISTMODES="1"/SHOWLISTMODES="0"/g' $SOURCE/Config

-	sed -i 's;//#undef FAKELAG_CONFIGURABLE;#define FAKELAG_CONFIGURABLE;g' $SOURCE/include/config.h

-	sed -i 's_\t\t\tsendnotice(acptr, "*** You were forced to join %s", jbuf);_\t\t\t//sendnotice(acptr, "*** You were forced to join %s", jbuf);_g' $SOURCE/src/modules/m_sapart.c

-	rm -r $SOURCE/doc/conf/aliases $SOURCE/doc/conf/examples $SOURCE/doc/conf/help

-	rm -r $SOURCE/doc/conf/*.conf

-	cp $HOME/dev/git/supernets/unrealircd/doc/conf/*.conf $SOURCE/doc/conf/

-	cp $HOME/dev/git/supernets/unrealircd/src/ssl.cnf $SOURCE/src/ssl.cnf

-	echo "edit your Makefile.in"

-}

 deploy() {

 	git clone --depth 1 https://github.com/supernets/unrealircd.git $SOURCE

@@ -39,6 +21,11 @@ deploy() {

 	$UNREAL/unrealircd start &

 }

+latest() {

+	local LATEST=$(curl -s https://www.unrealircd.org/downloads/list.json | sed -e 's/[{}]/''/g' | awk -v RS=',"' -F: '/^version/ {print $2}' | sed 's/\(^"\|"$\)//g')

+	[ $LATEST != $CURRENT ] && echo "new version available: $LATEST"

+}

+

 update() {

 	[ ! -z $(screen -ls | grep ircdwatchdog) ] && screen -S ircdwatchdog -X quit

 	[ ! -z $(abduco     | grep ircdwatchdog) ] && pkill -9 $(abduco | grep ircdwatchdog | awk '{print $4}')

@@ -55,16 +42,32 @@ update() {

 	watchdog

 }

+update_source() {

+	wget -O $SOURCE.tar.gz https://www.unrealircd.org/downloads/unrealircd-latest.tar.gz

+	tar -xvf $SOURCE.tar.gz --one-top-level --strip-components=1

+	rm $SOURCE.tar.gz

+	sed -i 's/NICKNAMEHISTORYLENGTH="2000"/NICKNAMEHISTORYLENGTH="100"/g' $SOURCE/Config

+	sed -i 's/REMOTEINC=""/REMOTEINC="1"/g' $SOURCE/Config

+	sed -i 's/PREFIXAQ="1"/PREFIXAQ="0"/g' $SOURCE/Config

+	sed -i 's/SHOWLISTMODES="1"/SHOWLISTMODES="0"/g' $SOURCE/Config

+	sed -i 's;//#undef FAKELAG_CONFIGURABLE;#define FAKELAG_CONFIGURABLE;g' $SOURCE/include/config.h

+	sed -i 's_\t\t\tsendnotice(acptr, "*** You were forced to join %s", jbuf);_\t\t\t//sendnotice(acptr, "*** You were forced to join %s", jbuf);_g' $SOURCE/src/modules/m_sapart.c

+	rm -r $SOURCE/doc/conf/aliases $SOURCE/doc/conf/examples $SOURCE/doc/conf/help

+	rm -r $SOURCE/doc/conf/*.conf

+	cp $HOME/dev/git/supernets/unrealircd/doc/conf/*.conf $SOURCE/doc/conf/

+	cp $HOME/dev/git/supernets/unrealircd/src/ssl.cnf $SOURCE/src/ssl.cnf

+	echo "edit your Makefile.in"

+}

+

 watchdog() {

 	if command -v abduco >/dev/null 2>&1; then

 		abduco -fnr ircdwatchdog     bash -c "while true; do [ ! -f $HOME/unrealircd/data/unrealircd.pid ] && $HOME/unrealircd/unrealircd start; sleep 15; done"

 	elif command -v screen >/dev/null 2>&1; then

 		screen -S   ircdwatchdog -dm bash -c "while true; do [ ! -f $HOME/unrealircd/data/unrealircd.pid ] && $HOME/unrealircd/unrealircd start; sleep 15; done"

-	else

-		echo "[!] - install abduco or screen"

 	fi

 }

 [ $1 = "deploy"   ] && deploy   && exit 1

+[ $1 = "latest"   ] && latest   && exit 1

 [ $1 = "update"   ] && update   && exit 1

 [ $1 = "watchdog" ] && watchdog && exit 1

diff --git a/monitor b/monitor

index fe4cbf1..e78c2a6 100755

--- a/monitor

+++ b/monitor

@@ -1,7 +1,7 @@

 #!/bin/sh

 while true; do

 	for i in $(dig irc.supernets.org A irc.supernets.org AAAA +short); do

-		ping -c 1 $i &> /dev/null

+		ping -c 1 $i 2>&1 >/dev/null

 		[ $? -ne 0 ] && echo "`date`: ping failed! ($i)" #&& notify-send "`date`: ping failed! ($i)"

 		sleep 1

 	done

diff --git a/startbots b/startbots

index 57dee8a..85a016c 100755

--- a/startbots

+++ b/startbots

@@ -17,10 +17,10 @@ get() {

 	wget -O $HOME/bots/5000.py https://raw.githubusercontent.com/acidvegas/trollbots/master/5000.py

 	mkdir -P $HOME/bots/anythinggoes/data

 	wget -O $HOME/bots/anythinggoes/anythinggoes.py https://github.com/acidvegas/random/blob/master/irc/anythinggoes/anythinggoes.py

-	wget -O $HOME/bots/anythinggoes/anythinggoes.py https://github.com/acidvegas/random/blob/master/irc/anythinggoes/data/banana.txt

-	wget -O $HOME/bots/anythinggoes/anythinggoes.py https://github.com/acidvegas/random/blob/master/irc/anythinggoes/data/crab.txt

-	wget -O $HOME/bots/anythinggoes/anythinggoes.py https://github.com/acidvegas/random/blob/master/irc/anythinggoes/data/crate.txt

-	wget -O $HOME/bots/anythinggoes/anythinggoes.py https://github.com/acidvegas/random/blob/master/irc/anythinggoes/data/worms.txt

+	wget -O $HOME/bots/anythinggoes/data/banana.txt https://github.com/acidvegas/random/blob/master/irc/anythinggoes/data/banana.txt

+	wget -O $HOME/bots/anythinggoes/data/crab.txt https://github.com/acidvegas/random/blob/master/irc/anythinggoes/data/crab.txt

+	wget -O $HOME/bots/anythinggoes/data/crate.txt https://github.com/acidvegas/random/blob/master/irc/anythinggoes/data/crate.txt

+	wget -O $HOME/bots/anythinggoes/data/worms.txt https://github.com/acidvegas/random/blob/master/irc/anythinggoes/data/worms.txt

 	wget -O $HOME/bots/cancer.py https://raw.githubusercontent.com/acidvegas/random/master/irc/cancer.py

 	git clone --depth 1 https://github.com/acidvegas/dickserv.git $HOME/bots/dickserv

 	mkdir $HOME/bots/irccex

@@ -31,4 +31,7 @@ get() {

 	rm -r $HOME/bots/scroll/scroll/data/art

 	git clone --depth 1 https://github.com/ircart/ircart.git $HOME/bots/scroll/scroll/data/art

 	wget -O $HOME/bots/spiderweb.py https://raw.githubusercontent.com/acidvegas/trollbots/master/spiderweb.py

-}

+}

+

+[ $1 = "start" ] && start && exit 1

+[ $1 = "get"   ] && get   && exit 1