diff options
| -rwxr-xr-x | Reaktor/IRC/reaktor.py | 3 | ||||
| -rwxr-xr-x | Reaktor/commands/caps | 2 | ||||
| -rw-r--r-- | Reaktor/config.py | 3 | ||||
| m--------- | Reaktor/repos/view-website | 0 | ||||
| m--------- | Reaktor/repos/whatweb | 0 | ||||
| -rwxr-xr-x | Reaktor/titlebot/commands/help | 1 | ||||
| -rw-r--r-- | ship/lib/_punani_db | 2 | ||||
| -rwxr-xr-x | ship/src/bootstrap_env_makefu | 1 | ||||
| -rw-r--r-- | sites/elchstats.nsupdate.info/graphite.journal.txt | 4 |
9 files changed, 9 insertions, 7 deletions
diff --git a/Reaktor/IRC/reaktor.py b/Reaktor/IRC/reaktor.py index ec306e7c..f9f25e57 100755 --- a/Reaktor/IRC/reaktor.py +++ b/Reaktor/IRC/reaktor.py @@ -86,8 +86,9 @@ class Reaktor(asybot): start = time() try: + print(myargv) p = popen(myargv, bufsize=1, stdout=PIPE, stderr=PIPE, env=env, cwd=cwd) - except (OSError, Exception) as error: + except Exception as error: self.ME(target, 'brain damaged') log.error('OSError@%s: %s' % (myargv, error)) return diff --git a/Reaktor/commands/caps b/Reaktor/commands/caps index b5d6642d..ac8cc66d 100755 --- a/Reaktor/commands/caps +++ b/Reaktor/commands/caps @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 import imp import os diff --git a/Reaktor/config.py b/Reaktor/config.py index ea00693f..b1158271 100644 --- a/Reaktor/config.py +++ b/Reaktor/config.py @@ -5,7 +5,8 @@ debug = False name = 'crabmanner' -workdir = expanduser('~') + '/state' +#workdir = expanduser('~') + '/state' +workdir = '/home/reaktor/state' irc_alarm_timeout = 300 irc_hammer_interval = 10 diff --git a/Reaktor/repos/view-website b/Reaktor/repos/view-website -Subproject 5b9a22cf872a9855b7cb5eddd7bf962dfbff50d +Subproject a3892837aabd5d95e997c0fd2526096f685669f diff --git a/Reaktor/repos/whatweb b/Reaktor/repos/whatweb -Subproject 0918a0d9b75df77f9c3e9eb360b6b22824582a2 +Subproject 362145cf80ccd82d4c32e15b37eeff745e0ba66 diff --git a/Reaktor/titlebot/commands/help b/Reaktor/titlebot/commands/help index 475ea98e..f04e43b7 100755 --- a/Reaktor/titlebot/commands/help +++ b/Reaktor/titlebot/commands/help @@ -3,6 +3,7 @@ cat <<EOF BGT Title Poll Bot: .new TITLE - suggest a new title .list <(age|votes)> - list all suggestions + .highest <NUM> - lists the NUM highest voted suggestions .up NUM (NUM ...) - upvote one or more suggestions from .list .undo NUM (NUM ...) - undo an upvote .clear - clear the poll (auth required) diff --git a/ship/lib/_punani_db b/ship/lib/_punani_db index e5bf15b1..6f89029f 100644 --- a/ship/lib/_punani_db +++ b/ship/lib/_punani_db @@ -19,7 +19,7 @@ _punanidb_aptget_pip2=python-pip _punanidb_pacman_virtualenv=python-virtualenv _punanidb_aptget_virtualenv=python-virtualenv -_punanidb_pacman_gpp=g++ +_punanidb_pacman_gpp=gcc _punanidb_aptget_gpp=gcc _punanidb_pacman_python2_dev=python2 diff --git a/ship/src/bootstrap_env_makefu b/ship/src/bootstrap_env_makefu index 188a48e7..e61f4e99 100755 --- a/ship/src/bootstrap_env_makefu +++ b/ship/src/bootstrap_env_makefu @@ -97,7 +97,6 @@ Bundle 'snipMate' Bundle 'tpope/vim-fugitive' Bundle 'Valloric/YouCompleteMe' Bundle 'scrooloose/syntastic' -Bundle 'scrooloose/syntastic' Bundle 'sjl/gundo.vim' nnoremap <F5> :GundoToggle<CR> diff --git a/sites/elchstats.nsupdate.info/graphite.journal.txt b/sites/elchstats.nsupdate.info/graphite.journal.txt index d3a73433..777f4650 100644 --- a/sites/elchstats.nsupdate.info/graphite.journal.txt +++ b/sites/elchstats.nsupdate.info/graphite.journal.txt @@ -17,8 +17,8 @@ cd /opt/graphite/conf cp carbon.conf.example carbon.conf # edit carbon.conf, fix max writes per second, max adds per minute cp storage-schemas.conf.example storage-schemas.conf -# edit storage-schemas.conf, fix storage time +# edit storage-schemas.conf, fix storage time cd /opt/graphite/webapp/graphite cp local_settings.py.example local_settings.py # change SECRET_KEY @@ -27,7 +27,7 @@ PYTHONPATH=/opt/graphite/webapp django-admin.py syncdb --settings=graphite.setti useradd -m graphite -d /opt/graphite -r chown -R graphite /opt/graphite -cd here +cd _here_ cp carbon.service /opt/systemd/system/ systemctl enable carbon systemctl start carbon |