Commit Graph

897 Commits

Author SHA1 Message Date
lassulus
533b62bed6 Revert "buildbot: RIP"
This reverts commit c786da701a.
2016-07-03 20:57:21 +02:00
tv
3d0f7724cc writeJq: init 2016-07-03 20:46:48 +02:00
tv
7f0ea39a97 Merge remote-tracking branch 'prism/master' 2016-07-03 20:44:09 +02:00
tv
8822005f00 net.addrs: readOnly = false 2016-07-03 20:34:51 +02:00
tv
7aedefa476 {mk,rm}dir: RIP 2016-07-03 20:32:16 +02:00
tv
cc6b1f6ad1 caxi: init 2016-07-03 20:22:45 +02:00
tv
814e823fcd secret-file: add defaults to all options 2016-07-03 19:45:29 +02:00
tv
57098e472a absolute-pathname: check stringLength > 0 2016-07-03 19:41:31 +02:00
lassulus
e4f4811fa7 Merge commit '2408e27fb198634c5e47885e5793ec2b96bcc3a5' 2016-07-01 14:49:28 +02:00
lassulus
3aeb97d9be k 5 go: set url to cgit.lassul.us 2016-07-01 12:04:16 +02:00
tv
75b2c8e6c9 prism: AKA cgit.prism.r 2016-07-01 01:07:20 +02:00
tv
1bacbe9309 go: echelon -> prism 2016-06-30 23:51:39 +02:00
tv
c786da701a buildbot: RIP 2016-06-30 22:44:27 +02:00
tv
2408e27fb1 ju: init 2016-06-30 22:41:44 +02:00
lassulus
b3fa9cbd7e Merge remote-tracking branch 'cd/master' 2016-06-30 21:51:09 +02:00
tv
7b46ccaba5 lib.getAttrs: init 2016-06-30 20:31:43 +02:00
tv
c6311d2187 writeOut: admit links 2016-06-30 19:11:08 +02:00
tv
d81b068113 Merge remote-tracking branch 'prism/master' 2016-06-30 16:31:05 +02:00
tv
1542f9bbee miefda: stash 2016-06-30 16:26:13 +02:00
lassulus
d9e5800e93 k 5 go: set go server to prism 2016-06-30 09:16:39 +02:00
lassulus
7550c66311 Merge remote-tracking branch 'cd/master' 2016-06-30 09:16:10 +02:00
tv
d1853501f0 writeSed: init 2016-06-30 02:43:28 +02:00
tv
385b0345a6 mv: stash 2016-06-30 01:43:33 +02:00
tv
20a9f59061 get: 1.4.0 -> 1.4.1 2016-06-29 13:56:28 +02:00
lassulus
a8a3ac5640 k 5 Reaktor: fix build on newer nixpkgs 2016-06-28 17:54:33 +02:00
lassulus
1012224e67 little bit of code cleanup 2016-06-28 17:41:15 +02:00
lassulus
edcdd5f067 k 5: override buildbots sqlalchemy 2016-06-27 19:58:41 +02:00
makefu
f2a13d6281
k 3 m: add siem network, add ossim stub 2016-06-27 12:57:08 +02:00
lassulus
1fcc20aa49 k 5 git-hooks: add option for branches 2016-06-26 19:20:11 +02:00
lassulus
13f7ef405b k 3 repo-sync: use the privateKeyFile 2016-06-26 18:20:56 +02:00
lassulus
16b639e50a k 3 repo-sync: add unitConfig option 2016-06-26 17:53:11 +02:00
lassulus
fe07d46310 k 3 l: add user mors-repo-sync 2016-06-26 17:51:52 +02:00
lassulus
ba0a7978ba k 3 repo-sync: set REPONAME
This is needed to allow multiple repo fetching at the same time
2016-06-24 16:04:04 +02:00
lassulus
2de4843bae k 3 l: add prism-repo-sync pubkey 2016-06-24 15:27:23 +02:00
lassulus
edcc01d8e3 k 3 repo-sync: refactor, allow multiple repos 2016-06-24 15:24:42 +02:00
lassulus
93567fa818 Merge remote-tracking branch 'cd/master' 2016-06-23 23:18:06 +02:00
tv
74f778c6e1 tv.pgp.pubkeys.default = readFile ./pgp/CBF89B0B.asc 2016-06-23 23:14:23 +02:00
makefu
271a59b1d6
Merge remote-tracking branch 'prism/master' 2016-06-23 17:04:07 +02:00
makefu
5894ecc942
add siem internal network 2016-06-23 16:45:44 +02:00
makefu
a7310f526d
krebs 3 tinc_graphs: allow network different from retiolum 2016-06-23 16:45:06 +02:00
lassulus
27522d311c k 3 l: add domsen-nas 2016-06-16 22:09:05 +02:00
lassulus
1e957a1255 k 3 l: RIP fastpoke 2016-06-16 22:07:29 +02:00
tv
88a486f26a ju: init 2016-06-14 16:25:49 +02:00
lassulus
d5cfc4bf19 Merge remote-tracking branch 'wolf/master' 2016-06-14 09:54:02 +02:00
makefu
eb710a17e2
Merge remote-tracking branch 'cd/master' 2016-06-14 01:36:15 +02:00
makefu
8656e83d4c
k 3 ma: update shoney ip after failed deploy :3 2016-06-14 01:34:08 +02:00
lassulus
23385c2984 Merge remote-tracking branch 'cd/master' 2016-06-13 13:50:52 +02:00
lassulus
b244441223 Merge remote-tracking branch 'gum/master' 2016-06-13 12:54:15 +02:00
tv
2dd4dbbf6e scatter some sigils 2016-06-13 02:23:30 +02:00
tv
a16f438314 sprinkle with some write{B,D}ash 2016-06-13 02:10:02 +02:00
tv
fb226f3498 lib.genAttrs': init 2016-06-13 01:48:59 +02:00
tv
3846e08de8 types.{addr*,label,{host,file,{absolute-,}path}name}: use isString 2016-06-13 01:40:57 +02:00
tv
0cfce6d18d makeScriptWriter: init 2016-06-13 01:38:58 +02:00
tv
e769ff0838 lib.write{Files => Out}: admit file mode 2016-06-13 01:38:58 +02:00
tv
fcfe4b6461 types.file-mode: init 2016-06-13 01:38:58 +02:00
tv
2adb41310c lib.lpad: init 2016-06-13 01:23:44 +02:00
tv
3c61d227cf lib.guard: init 2016-06-13 01:16:21 +02:00
lassulus
4e001014c9 Merge remote-tracking branch 'cd/master' 2016-06-12 21:37:27 +02:00
makefu
b9c0c46b4d
m shoney: init 2016-06-12 19:48:15 +02:00
makefu
2f940d77f1
Merge remote-tracking branch 'cd/master' 2016-06-12 19:01:34 +02:00
tv
29442eda7c krebs {absolute,}-pathname: admit harder 2016-06-12 18:13:05 +02:00
makefu
ed1d336fc8
Merge remote-tracking branch 'cd/master' 2016-06-12 17:49:59 +02:00
tv
fb8be5838a writeFiles: init 2016-06-12 13:54:05 +02:00
tv
8353b1293e krebs {{absolute-,}path,user}name: mergeOneOption 2016-06-11 16:36:42 +02:00
tv
cda4c2d96b krebs types.filename: maximize strictness 2016-06-11 16:35:13 +02:00
tv
c80aee7a0b krebs types.filename: admit <underscore> 2016-06-11 16:27:47 +02:00
lassulus
0d20b15ae3 k 3 l: add cache.prism.r as alias 2016-06-11 00:27:44 +02:00
makefu
7fe3cdd804
k 3 m: fix filepimp pubkey 2016-06-09 22:55:28 +02:00
tv
276bbe725f Merge remote-tracking branch 'gum/master' 2016-06-08 11:11:41 +02:00
tv
b419d6cd36 krebs.git.user.home: /var/lib/git -> pkgs.empty 2016-06-07 23:38:33 +02:00
tv
a431e036e3 krebs.git: move assert to etcDir's type 2016-06-07 23:34:16 +02:00
tv
567800c98e krebs.git.cgit.settings.virtual-root: init 2016-06-07 23:23:06 +02:00
tv
5e91e789b6 krebs types.absolute-pathname: admit / 2016-06-07 23:22:12 +02:00
tv
78dfd1fee8 cgit: RIP 2016-06-07 23:10:27 +02:00
tv
c8b0a57549 krebs.git.cgit: add server name for cgit.*.r 2016-06-07 23:08:55 +02:00
tv
922389ef20 krebs.git.cgit.fcgiwrap: make user configurable 2016-06-07 23:02:37 +02:00
tv
f90f8dc000 empty: init at 1.0.0 2016-06-07 22:51:35 +02:00
tv
a3644a38a5 krebs.git: make user configurable 2016-06-07 22:49:26 +02:00
tv
c655e1246d krebs.git: s/ensureList/toList/ 2016-06-07 22:41:40 +02:00
tv
4a34b27c1c krebs.git.cgit: make cache-root configurable
... along with all the other stuff :)
2016-06-07 22:38:38 +02:00
tv
6fcc35afb0 krebs types.uint: init 2016-06-07 22:36:58 +02:00
tv
b5bdd9aed4 krebs.git.cgit :: { bool => submodule { enable :: bool } } 2016-06-07 03:11:26 +02:00
tv
39ebd5001e getAttrDef: RIP 2016-06-07 02:15:58 +02:00
makefu
49ac020be0
k 5 acng: 0.8.8 -> 0.9.3 2016-06-06 21:58:17 +02:00
tv
dda2887e2c Merge remote-tracking branch 'cloudkrebs/master' 2016-06-06 17:17:07 +02:00
lassulus
baa20586b8 Merge remote-tracking branch 'cd/master' 2016-06-05 00:38:00 +02:00
tv
c1c645b545 krebs.setuid: add option "envp" 2016-06-05 00:31:36 +02:00
tv
a0a2606f8d krebs pkgs.writeBash{,Bin}: init 2016-06-05 00:24:42 +02:00
tv
fc826f8f7a krebs pkgs.{writeHaskellBin => writeHaskell} 2016-06-04 19:48:43 +02:00
tv
ed56f41ddc krebs types.haskell.{con,mod}id: init 2016-06-04 19:06:50 +02:00
makefu
ff38a9bf0b
k 3 ma: fix addrs4 for tpsw 2016-06-02 14:41:38 +02:00
makefu
4f28d9a306
Merge remote-tracking branch 'prism/master' 2016-06-02 11:17:18 +02:00
lassulus
7bd85d7bbb k 5: disable buildbot override 2016-06-01 00:14:48 +02:00
lassulus
806e592d3e k 3 nginx: unique server-names to silence nginx 2016-06-01 00:07:14 +02:00
lassulus
cc938e61f8 k 3 iptables: allow DNAT rules 2016-05-29 00:32:55 +02:00
lassulus
a240a60b52 Merge remote-tracking branch 'cd/master' into HEAD 2016-05-25 11:14:32 +02:00
tv
2b71d7f728 writeNixFromCabal: deprecate 2016-05-25 00:28:09 +02:00
tv
0d8a0ed71d writeHaskellBin: init 2016-05-25 00:08:34 +02:00
lassulus
48502fb07e k 3 l: add fritz pubkey 2016-05-24 23:19:43 +02:00
lassulus
ce0cef9806 Merge remote-tracking branch 'cd/master' 2016-05-24 22:49:52 +02:00
makefu
ebe4cb290c
Merge remote-tracking branch 'cd/master' 2016-05-24 22:42:34 +02:00
tv
2ccafac558 writeEximConfig: disable validation 2016-05-24 22:36:04 +02:00
makefu
c1971f5aa0
Merge remote-tracking branch 'cloudkrebs/master' 2016-05-24 22:27:21 +02:00
makefu
9cba0ffefa
merge cd/master 2016-05-24 22:12:38 +02:00
tv
c44e649455 krebs.exim-retiolum: disable TLS 2016-05-24 20:59:05 +02:00
lassulus
facb65bd22 Merge remote-tracking branch 'cd/master' 2016-05-21 13:57:45 +02:00
lassulus
41e93449bb k 3 l: add shodan keys 2016-05-21 13:46:41 +02:00
lassulus
7c8bd6c551 k 3 l: move pubkeys to seperate files 2016-05-21 13:45:48 +02:00
tv
97c2e4bbd9 krebs.exim: validate config file syntax 2016-05-21 11:19:35 +02:00
tv
ace70674aa {mv,tv}.mail: retiolum -> r 2016-05-21 11:19:35 +02:00
tv
1e9199f939 krebs internet-aliases: *@eloop.org -> eloop2016@krebsco.de 2016-05-21 09:28:50 +02:00
tv
ca48a77050 exim-smarthost: allow per-domain defaults in internet-aliases 2016-05-21 09:27:55 +02:00
lassulus
fc867f652f Merge remote-tracking branch 'cd/master' 2016-05-20 00:18:00 +02:00
lassulus
83fd472251 buildbot sqlalclchemy_migrate_0_7: disable check 2016-05-20 00:01:28 +02:00
lassulus
f46b3153c0 symlinkJoin: compat 2016-05-19 23:55:29 +02:00
lassulus
88e53970c1 k 3 per-user: use new symlinkJoin interface 2016-05-19 21:16:45 +02:00
lassulus
127507ccc7 k 3 l: add shodan 2016-05-19 21:11:16 +02:00
tv
ee0c30cbe5 exim-smarthost: update ciko's mail 2016-05-19 15:43:06 +02:00
tv
c40ff531b4 exim-smarthost: cfp@eloop.org -> eloop2016 ML 2016-05-19 15:18:26 +02:00
tv
289231f197 exim-smarthost: add eloop2016 ML 2016-05-19 15:05:16 +02:00
lassulus
abf23d1305 k 3 l: update echelon ip 2016-05-17 11:46:09 +02:00
makefu
cee893f371 k 3 makefu: add tpsw, owned by ciko 2016-05-16 23:08:20 +02:00
lassulus
e7528ccc2f Merge remote-tracking branch 'gum/master' 2016-05-09 11:27:06 +02:00
lassulus
fb87c76112 Merge remote-tracking branch 'cd/master' 2016-05-09 11:26:04 +02:00
lassulus
ba5ea161f2 k 3 l: update echelon ip 2016-05-09 11:14:34 +02:00
makefu
56ca7859fa k 3 m: fix filebitch key 2016-05-07 00:21:56 +02:00
makefu
c9602f5d1a k 5 forticlientsslvpn: add comments 2016-05-02 17:39:34 +02:00
makefu
6a9a738f30 k 5 repo-sync: 0.2.5 -> 0.2.6 2016-05-02 17:38:55 +02:00
makefu
e4251e63ac k 3 fetchWallpaper: move only if exists 2016-05-02 17:36:16 +02:00
tv
9b0edc2ee8 krebs.build.populate: set SSL_CERT_FILE 2016-04-28 22:24:44 +02:00
lassulus
94fa4005d6 Merge remote-tracking branch 'cd/master' 2016-04-27 12:47:13 +02:00
tv
4abd59f59d krebs.exim-{retiolum,smarthost}: use krebs.exim 2016-04-27 01:54:58 +02:00
tv
96301634b9 services.exim -> krebs.exim 2016-04-27 01:52:52 +02:00
tv
f9d42f3a81 import NixOS' services.exim 2016-04-27 01:45:47 +02:00
tv
87dabec64d krebs types.group: init 2016-04-27 01:45:47 +02:00
lassulus
558eede973 k 3 fetchWallpaper: use writeDash 2016-04-27 01:31:26 +02:00
lassulus
6762a8790c Merge remote-tracking branch 'cd/master' 2016-04-20 16:05:38 +02:00
tv
54947849ff tv: "fix" PGP key 2016-04-20 16:03:02 +02:00
lassulus
2f99d1f4b7 k 3 l: update pgp key 2016-04-19 16:56:44 +02:00
lassulus
c7a6e74b3d Merge remote-tracking branch 'cd/master' 2016-04-18 15:10:43 +02:00
tv
41ff57c6d6 krebs.backup: use globally configured ssh ports 2016-04-17 11:23:35 +02:00
tv
f5f7abce0d krebs: programs.ssh.extraConfig += Host ... Port ... 2016-04-17 10:23:01 +02:00
tv
377b0dff1c krebs.backup: don't create plan.dst.path implicitly 2016-04-17 06:00:48 +02:00
tv
70c27e21b1 krebs.backup: rm stale TODO
Done in 13df24f8f0
2016-04-17 05:26:02 +02:00
tv
6ec3d922a4 krebs.backup network-ssh-port -> pkgs.get-ssh-port 2016-04-17 05:24:33 +02:00
tv
affb69250d krebs.backup network-ssh-port: fail if cannot find port 2016-04-17 04:13:32 +02:00
tv
453384b60b krebs.backup: inject dst_path into dst shell 2016-04-17 03:51:55 +02:00
tv
904d037bd7 krebs.backup: allow injecting variables into dst shell 2016-04-17 03:50:49 +02:00
tv
e4422212d4 krebs.on-failure: send journal since start of failed plan 2016-04-17 02:04:52 +02:00
makefu
f043929668 k 3 retiolum: use more precise description for connectTo 2016-04-17 02:04:33 +02:00