aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-08-28 23:39:37 +0200
committermakefu <github@syntax-fehler.de>2015-08-28 23:39:37 +0200
commit7eba4293714b9dce86c07ccf2fdaddaa11a4c3c7 (patch)
tree28fdc7158cd28e4b25cf5674ab54da8da8b69c1e
parent15026716ab3057998cf2f487742c2dd8e185335c (diff)
Reaktor: add nix support, packaging
-rw-r--r--README.md25
-rw-r--r--Reaktor.nix15
l---------commands/revip1
l---------commands/subdomains1
l---------commands/visit-page1
-rw-r--r--default.nix15
-rwxr-xr-xreaktor/commands/badcommand (renamed from commands/badcommand)0
-rwxr-xr-xreaktor/commands/caps (renamed from commands/caps)0
-rwxr-xr-xreaktor/commands/hello (renamed from commands/hello)0
-rwxr-xr-xreaktor/commands/identify (renamed from commands/identify)0
-rwxr-xr-xreaktor/commands/licht_resolver (renamed from commands/licht_resolver)0
-rwxr-xr-xreaktor/commands/nag (renamed from commands/nag)0
-rwxr-xr-xreaktor/commands/reload (renamed from commands/reload)0
-rwxr-xr-xreaktor/commands/respond (renamed from commands/respond)0
-rwxr-xr-xreaktor/commands/rev (renamed from commands/rev)0
-rwxr-xr-xreaktor/commands/say (renamed from commands/say)0
-rwxr-xr-xreaktor/commands/taken (renamed from commands/taken)0
-rwxr-xr-xreaktor/commands/tell-on_join (renamed from commands/tell-on_join)0
-rwxr-xr-xreaktor/commands/tell-on_privmsg (renamed from commands/tell-on_privmsg)0
-rwxr-xr-xreaktor/commands/uptime (renamed from commands/uptime)0
-rwxr-xr-xreaktor/commands/whatweb (renamed from commands/whatweb)0
-rwxr-xr-xreaktor/commands/whois (renamed from commands/whois)0
22 files changed, 34 insertions, 24 deletions
diff --git a/README.md b/README.md
index a581c6b..af14d96 100644
--- a/README.md
+++ b/README.md
@@ -2,25 +2,8 @@
## Quickstart
- ## 1. create a dedicated user
- useradd reaktor
+ pip install -e .
+ useradd reaktor -m /opt/Reaktor
+ sudo -u reaktor reaktor run
- ## 2. marry Reaktor with /sbin/init
-
- ## 2a. /etc/inittab-like foo
- echo 10:2345:respawn:/bin/su reaktor -c /krebs/Reaktor/index >>/etc/inittab
- # or 10:2345:respawn:/usr/bin/sudo -u reaktor /krebs/Reaktor/index
- # if reaktor's shell is /bin/false or similar
- # [check with e.g getent passwd reaktor]
- telinit q
-
- ## 2b. upstart-like foo
-
- cat > /etc/init/Reaktor.conf <<EOF
- description "Krebs Reaktor"
- author "The Ministerium"
- stop on runlevel [016]
- respawn
- exec /usr/bin/sudo -u reaktor /krebs/Reaktor/index
- EOF
- start Reaktor
+## autostart
diff --git a/Reaktor.nix b/Reaktor.nix
new file mode 100644
index 0000000..b804b44
--- /dev/null
+++ b/Reaktor.nix
@@ -0,0 +1,15 @@
+with import <nixpkgs> {};
+# nix-build Reaktor.nix
+# result/bin/reaktor
+
+buildPythonPackage rec {
+ name = "Reaktor-${version}";
+ version = "0.2.6";
+ propagatedBuildInputs = with pkgs.pythonPackages;[
+ pythonPackages.docopt
+ ];
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/R/Reaktor/Reaktor-0.2.6.tar.gz";
+ sha256 = "1dksw1s1n2hxvnga6pygjr174dywncr0wiggkrkn1srbn2amh1c2";
+ };
+}
diff --git a/commands/revip b/commands/revip
deleted file mode 120000
index e2c3b7a..0000000
--- a/commands/revip
+++ /dev/null
@@ -1 +0,0 @@
-../repos/revip/revip \ No newline at end of file
diff --git a/commands/subdomains b/commands/subdomains
deleted file mode 120000
index 0489555..0000000
--- a/commands/subdomains
+++ /dev/null
@@ -1 +0,0 @@
-../repos/consolidate_dns/index \ No newline at end of file
diff --git a/commands/visit-page b/commands/visit-page
deleted file mode 120000
index 8723336..0000000
--- a/commands/visit-page
+++ /dev/null
@@ -1 +0,0 @@
-../repos/view-website/runner.sh \ No newline at end of file
diff --git a/default.nix b/default.nix
new file mode 100644
index 0000000..96e3b12
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,15 @@
+with import <nixpkgs> {};
+# nix-shell --pure .
+stdenv.mkDerivation rec {
+ name = "Reaktor-${version}";
+ version = "0.2.6";
+ buildInputs = with pkgs;[
+ python34
+ python34Packages.docopt
+ ];
+
+ shellHook =''
+ [ ! -d venv ] && virtualenv --python=python3.4 venv
+ . venv/bin/activate
+ '' ;
+}
diff --git a/commands/badcommand b/reaktor/commands/badcommand
index c59b4d1..c59b4d1 100755
--- a/commands/badcommand
+++ b/reaktor/commands/badcommand
diff --git a/commands/caps b/reaktor/commands/caps
index ac8cc66..ac8cc66 100755
--- a/commands/caps
+++ b/reaktor/commands/caps
diff --git a/commands/hello b/reaktor/commands/hello
index 05ed79b..05ed79b 100755
--- a/commands/hello
+++ b/reaktor/commands/hello
diff --git a/commands/identify b/reaktor/commands/identify
index c2fb2c5..c2fb2c5 100755
--- a/commands/identify
+++ b/reaktor/commands/identify
diff --git a/commands/licht_resolver b/reaktor/commands/licht_resolver
index 5bdb651..5bdb651 100755
--- a/commands/licht_resolver
+++ b/reaktor/commands/licht_resolver
diff --git a/commands/nag b/reaktor/commands/nag
index f214139..f214139 100755
--- a/commands/nag
+++ b/reaktor/commands/nag
diff --git a/commands/reload b/reaktor/commands/reload
index bfa1f04..bfa1f04 100755
--- a/commands/reload
+++ b/reaktor/commands/reload
diff --git a/commands/respond b/reaktor/commands/respond
index e23dc3e..e23dc3e 100755
--- a/commands/respond
+++ b/reaktor/commands/respond
diff --git a/commands/rev b/reaktor/commands/rev
index a8681ab..a8681ab 100755
--- a/commands/rev
+++ b/reaktor/commands/rev
diff --git a/commands/say b/reaktor/commands/say
index 8b83c05..8b83c05 100755
--- a/commands/say
+++ b/reaktor/commands/say
diff --git a/commands/taken b/reaktor/commands/taken
index b8beba6..b8beba6 100755
--- a/commands/taken
+++ b/reaktor/commands/taken
diff --git a/commands/tell-on_join b/reaktor/commands/tell-on_join
index 2dbff41..2dbff41 100755
--- a/commands/tell-on_join
+++ b/reaktor/commands/tell-on_join
diff --git a/commands/tell-on_privmsg b/reaktor/commands/tell-on_privmsg
index 5d0aff4..5d0aff4 100755
--- a/commands/tell-on_privmsg
+++ b/reaktor/commands/tell-on_privmsg
diff --git a/commands/uptime b/reaktor/commands/uptime
index 7ff6416..7ff6416 100755
--- a/commands/uptime
+++ b/reaktor/commands/uptime
diff --git a/commands/whatweb b/reaktor/commands/whatweb
index 36711ef..36711ef 100755
--- a/commands/whatweb
+++ b/reaktor/commands/whatweb
diff --git a/commands/whois b/reaktor/commands/whois
index b073389..b073389 100755
--- a/commands/whois
+++ b/reaktor/commands/whois