Commit Graph

2141 Commits

Author SHA1 Message Date
lassulus
d0a55575fa Merge remote-tracking branch 'ni/master' 2019-01-25 19:41:00 +01:00
tv
b3c65141b8 reaktor2: 0.1.4 -> 0.1.5 2019-01-25 14:54:31 +01:00
tv
7c160fd1fa blessings: 1.3.0 -> 2.1.0 2019-01-25 14:32:11 +01:00
lassulus
1f6b43acbd Merge remote-tracking branch 'ni/master' 2019-01-24 22:58:09 +01:00
tv
2e5ed5d1bb reaktor2: 0.1.2 -> 0.1.3 2019-01-24 21:16:44 +01:00
tv
f60d286746 reaktor2: 0.1.1 -> 0.1.2 2019-01-24 17:26:12 +01:00
lassulus
0cc3dd577d Merge remote-tracking branch 'ni/master' 2019-01-23 16:55:51 +01:00
tv
00c529b9d5 Reaktor random-emoji: curl -S 2019-01-23 14:08:51 +01:00
tv
282e4049b6 Reaktor scripts: chmod +x 2019-01-23 14:02:05 +01:00
tv
31a987903f reaktor2: 0.1.0 -> 0.1.1 2019-01-23 13:52:00 +01:00
tv
659eb2e6c5 reaktor2: 0.0.0 -> 0.1.0 2019-01-23 01:00:58 +01:00
lassulus
61a6467906 Merge remote-tracking branch 'ni/master' 2019-01-22 19:35:19 +01:00
tv
ef6d1453c3 krebs: import reaktor2 service 2019-01-22 19:35:03 +01:00
lassulus
30bfcf1a10 reaktor-krebs: join #nixos-de 2019-01-22 16:23:08 +01:00
lassulus
bc2aedb2d0 Mic92: change mail address 2019-01-21 16:25:51 +01:00
lassulus
9033d807f9 external: add idontcare.r 2019-01-21 16:25:27 +01:00
lassulus
144e2c5571 Merge remote-tracking branch 'ni/master' 2019-01-21 16:24:43 +01:00
lassulus
bc61d4df90 Merge remote-tracking branch 'gum/master' 2019-01-21 16:24:29 +01:00
tv
fabef36385 reaktor2 service: init 2019-01-21 12:28:30 +01:00
tv
153d27e6c8 reaktor2: init at 0.0.0 2019-01-21 12:28:30 +01:00
tv
f129810317 krebs hosts: extraHost -> hosts 2019-01-21 11:51:15 +01:00
tv
af0463b234 krebs: move hosts to dedeicated file 2019-01-21 11:04:37 +01:00
tv
799f132d58 krebs: move retiolum-hosts to dedicated file 2019-01-21 10:54:01 +01:00
tv
da79d23ebb krebs: move dns stuff to dedicated file 2019-01-21 10:33:23 +01:00
tv
9082adf687 krebs: move exim aliases to dedicated file 2019-01-21 10:22:18 +01:00
tv
9f2a646566 krebs: move github known hosts to dedicated file 2019-01-21 10:09:46 +01:00
tv
c4be6cf076 blessings: 1.2.0 -> 1.3.0 2019-01-18 13:58:42 +01:00
lassulus
1decf0bf37 nixpkgs: 0396345 -> 97e0d53 2019-01-18 12:43:00 +01:00
tv
6cef97deb3 Merge remote-tracking branch 'prism/master' 2019-01-16 11:20:14 +01:00
lassulus
879b6d319a Merge remote-tracking branch 'ni/master' 2019-01-16 11:17:20 +01:00
tv
2d2ab95f07 krebs tinc: Broadcast = no 2019-01-16 11:10:34 +01:00
makefu
dd22da5e6b
external: new ip for eve 2019-01-11 22:50:40 +01:00
lassulus
a1d9c22bbd Reaktor plugins: merge task with todo, make task like todo 2019-01-10 20:17:51 +01:00
tv
6e5a61b676 per-user module: enable only if configured 2019-01-05 20:16:17 +01:00
makefu
704f2854f0
Merge remote-tracking branch 'lass/master' 2019-01-03 23:27:05 +01:00
makefu
6044ffe3a5
external: use unused ip for matchbox 2019-01-03 23:01:16 +01:00
makefu
4715e28304
Merge remote-tracking branch 'lass/master' 2019-01-03 22:55:53 +01:00
lassulus
7176d12ff8 external matchbox: use free ipv4 2019-01-03 22:28:44 +01:00
lassulus
05f9389e4f krops: use nixpkgs derivation for ci 2019-01-03 21:32:29 +01:00
lassulus
6db1a249e6 nixpkgs: b9fa31c -> 0396345 2019-01-03 17:24:50 +01:00
lassulus
de6ca6e60b external: add matchbox 2019-01-02 21:48:07 +01:00
makefu
e71561caaf
ma cake.r: add Mic92 ssh key to authorized keys 2018-12-31 10:15:22 +01:00
jeschli
06b6454af7 Merge branch 'master' of prism.r:stockholm 2018-12-28 14:48:30 +01:00
lassulus
fb254e6094 external: remove miaoski wrong subnet 2018-12-26 23:48:54 +01:00
lassulus
7a4ec8bdb5 external: add kmein pubkey 2018-12-26 16:28:46 +01:00
lassulus
48847ca815 external: add miaoski 2018-12-25 14:38:29 +01:00
lassulus
8b4beb8138 l daedalus.w: fix alias 2018-12-25 14:38:00 +01:00
lassulus
371e223665 external: set wiregrill ip6 2018-12-25 14:21:45 +01:00
lassulus
cabb397b83 nixpkgs: 7e88992 -> b9fa31c 2018-12-24 16:34:34 +01:00
lassulus
4c60ad0e08 l daedalus: fix typo in ipv6 2018-12-24 16:32:19 +01:00
lassulus
2e4266297a l wiregrill: remove obsolete ipv4 2018-12-24 15:48:35 +01:00
lassulus
50d91aa83f nixpkgs: 5d4a1a3 -> 7e88992 2018-12-19 20:54:01 +01:00
makefu
337761712a
external: move tpsw from makefu, add justraute 2018-12-19 14:41:56 +01:00
makefu
30654e46c6
external: sort 2018-12-19 14:33:07 +01:00
makefu
d0a02bf54d
external: move users from makefu namespace to external 2018-12-19 14:25:03 +01:00
lassulus
adcb9ff179 Merge remote-tracking branch 'ni/master' 2018-12-18 22:12:08 +01:00
lassulus
b199a386d3 external: add qubasa 2018-12-18 21:57:08 +01:00
tv
0b57526d4f tv: configure the wiregrill 2018-12-18 21:40:52 +01:00
tv
f7e0cdbc14 lass prism: set wiregrill subnets explicitly 2018-12-18 21:17:41 +01:00
jeschli
8605ac91ae Merge branch 'master' of prism.r:stockholm 2018-12-16 20:28:28 +01:00
lassulus
24330950fe wirelum -> wiregrill 2018-12-16 16:11:02 +01:00
lassulus
4e04b2ac99 l: rip xerxes 2018-12-15 23:02:22 +01:00
lassulus
f0fc2013d7 l: update shodan wirelum key 2018-12-15 23:01:55 +01:00
lassulus
9e6dbd6df4 l: set short ipv6 addresses for all hosts 2018-12-15 21:10:05 +01:00
makefu
97aaf34c33
Merge remote-tracking branch 'lass/master' into HEAD 2018-12-12 17:53:38 +01:00
tv
e55b540928 krebs hosts: add owner to testHosts, too ^_^' 2018-12-11 23:11:40 +01:00
tv
313712ebc2 hosts.*.net.retiolum.ip6.addr: use genipv6 2018-12-11 22:06:35 +01:00
makefu
2e18ee84f0
ma: sort hostnames for euer, add netdata.euer.krebsco.de 2018-12-10 00:09:03 +01:00
lassulus
30772247c0 l: add morpheus.r 2018-12-09 17:12:34 +01:00
lassulus
c739f81e5b l: add wirelum to prism, mors, shodan, icarus, yellow 2018-12-09 17:02:50 +01:00
lassulus
a289812df1 l: add phone.w 2018-12-09 17:01:51 +01:00
lassulus
60f1e40445 dns.providers: add wirelum (w) 2018-12-09 16:52:45 +01:00
lassulus
43be8e6bb3 git: set correct owner on /tmp/cgit 2018-12-06 20:07:22 +01:00
lassulus
7fab6f2dfe l hosts: remove deprecated gg23 net 2018-12-05 16:50:39 +01:00
makefu
a4556a17f6
Merge remote-tracking branch 'lass/master' into HEAD 2018-12-05 16:41:38 +01:00
lassulus
c2d2e0e01d move external hosts from lass to external 2018-12-05 16:17:28 +01:00
lassulus
3dd503e08f remove unused domsen-nas host 2018-12-05 16:05:47 +01:00
lassulus
d6fba75f21 l: remove deprecated iso host 2018-12-05 15:51:46 +01:00
lassulus
29998a8a35 snews: prefix with _ 2018-12-05 09:01:56 +01:00
lassulus
a8aa26bab1 l: adopt scardanelli & homeros (kmein) 2018-12-04 21:32:02 +01:00
jeschli
5030b74cc5 Merge branch 'master' of prism.r:stockholm 2018-12-04 19:27:27 +01:00
lassulus
d30118879d Merge remote-tracking branch 'ni/master' 2018-12-04 08:08:43 +01:00
makefu
42e64be388
cache.nsupdate.info: bump index 2018-12-03 22:06:23 +01:00
lassulus
4d36900c6f Reaktor: add user only if active 2018-12-03 17:39:34 +01:00
tv
63798eb150 cabal-read: init 2018-12-03 09:51:38 +01:00
lassulus
692271b2b9 tinc_graphs: use genid_uint31 2018-12-03 09:46:19 +01:00
lassulus
dec7956b53 fetchWallpaper: use genid_uint31 2018-12-03 09:46:09 +01:00
lassulus
176883b37d bepasty-server: use genid_uint31 2018-12-03 09:45:56 +01:00
makefu
5782a4de2e
cache.nixos.org: provide index.html 2018-12-03 09:20:14 +01:00
lassulus
0d7433f8ea l: remove more fritz 2018-12-03 05:01:22 +01:00
lassulus
d1c7ec94eb Merge remote-tracking branch 'ni/master' 2018-12-03 04:59:27 +01:00
tv
24b07c3284 urlwatch service: use genid_uint31
Refs https://github.com/systemd/systemd/issues/11026
2018-12-02 20:19:19 +01:00
tv
eb32d03802 github-hosts-sync service: use genid_uint31
Refs https://github.com/systemd/systemd/issues/11026
2018-12-02 20:16:16 +01:00
makefu
b8db729338
Merge remote-tracking branch 'lass/master' 2018-11-30 23:19:32 +01:00
makefu
91e05287a7
k binary-cache: use https://cache.krebsco.de 2018-11-30 23:15:36 +01:00
makefu
a2b8571c5e
ma: fix ssh key of ulrich 2018-11-30 23:02:21 +01:00
lassulus
f6b5bbc305 Merge remote-tracking branch 'ni/master' 2018-11-30 20:42:01 +01:00
tv
5f0b1b8035 lib: add mapNixDir{,1} 2018-11-30 09:47:26 +01:00
lassulus
cd3b73955e l: RIP cabal.r 2018-11-30 04:40:59 +01:00
lassulus
293a82ad3b maintain realwallpaper in stockholm 2018-11-30 04:36:37 +01:00
lassulus
740f8c8ccf l: move download stuff to yellow.r 2018-11-30 04:35:00 +01:00
tv
53359a60f5 xmonad-stockholm: 1.2.0 -> 1.3.0 2018-11-29 21:56:52 +01:00
lassulus
95f6255f58 * krops: merge krebs-nixpkgs into krebs-source 2018-11-28 22:18:54 +01:00
lassulus
a69175a719 Merge remote-tracking branch 'ni/master' into ci 2018-11-28 18:55:08 +01:00
lassulus
f69a078f90 krops: reformat secrets (style) 2018-11-28 12:36:18 +01:00
lassulus
61f1aba8bc * krops: get nixpkgs from store for ci 2018-11-28 12:36:18 +01:00
lassulus
856c4777d1 ci: js -> json, output to stderr 2018-11-28 12:36:17 +01:00
lassulus
00ff16d540 ci get_steps: explicit pkg references 2018-11-27 20:38:59 +01:00
tv
dae35c44c7 krebs: integrate 5pkgs as overlay 2018-11-27 11:54:25 +01:00
lassulus
0b6c07ad72 buildbot: don't fuckup permissions 2018-11-27 04:19:07 +01:00
lassulus
593b2baf03 fetchWallpaper: remove broken maxTime 2018-11-27 00:58:57 +01:00
lassulus
09ee7ca4d8 ci: add gcroot for build-scripts 2018-11-27 00:58:07 +01:00
lassulus
c35bc044db ci: abort if an error occurs in get_steps 2018-11-27 00:55:59 +01:00
lassulus
6fe8e37aa6 Merge remote-tracking branch 'gum/master' 2018-11-26 00:00:21 +01:00
makefu
4fedcb8147
ma gum.r: fix pubkey
which accidentally got overwritten ...
2018-11-25 23:45:27 +01:00
lassulus
91e4f7fd92 nixpkgs: bf7930d -> 5d4a1a3 2018-11-25 18:20:40 +01:00
makefu
a6f4d27da6
ma: gum.r also resolves to torrent.gum.r 2018-11-22 09:38:33 +01:00
lassulus
105a0b6515 cachecache: enable only if enabled 2018-11-21 04:10:07 +01:00
makefu
c4484dee1a
puyak.r: disable cache again 2018-11-21 00:06:05 +01:00
makefu
b073ee1fd4
puyak.r: add cache.nsupdate.info 2018-11-21 00:03:49 +01:00
tv
f2ca6be6a7 Merge remote-tracking branch 'gum/master' 2018-11-14 09:24:59 +01:00
tv
ddfddbe756 ci: register GC roots 2018-11-13 22:04:49 +01:00
tv
8f6dc4a131 ejabberd: replaced by upstream 2018-11-13 21:19:48 +01:00
makefu
e3efeb6dd5
Merge remote-tracking branch 'lassul.us/master' 2018-11-10 22:05:40 +01:00
makefu
0c235a88a8
ma: disable some host ci 2018-11-10 21:11:23 +01:00
lassulus
f2dd2793cd l dns-stuff: sort 2018-11-10 20:29:39 +01:00
lassulus
ee8196c20f Merge remote-tracking branch 'ni/master' 2018-11-10 20:19:20 +01:00
lassulus
cd720e1a9e l: add cache.krebsco.de & cache.lassul.us 2018-11-10 20:18:41 +01:00
tv
dfb9c23760 krebs: add youtube@eloop.org 2018-11-10 20:06:31 +01:00
lassulus
05b288604e Merge remote-tracking branch 'ni/master' 2018-11-10 19:43:15 +01:00
lassulus
eff97662c0 Merge remote-tracking branch 'nextgum/master' 2018-11-10 19:42:46 +01:00
makefu
125f9d7fd9
airdcpp module: after local-fs.target 2018-11-10 19:27:17 +01:00
lassulus
6416e26376 realwallpaper: e056328 -> 847faeb 2018-11-10 18:47:34 +01:00
lassulus
70bffd8b90 hotdog.r: remove import of gitlab-runner-shackspace 2018-11-10 18:47:06 +01:00
jeschli
78b2892019 j xmonad-stockholm: commented develop src 2018-11-06 19:35:59 +01:00
jeschli
3e9bb37d6f Merge remote-tracking branch 'origin/master' 2018-11-06 19:33:00 +01:00
makefu
254e9e62b9
Merge remote-tracking branch 'lassul.us/master' 2018-11-05 18:20:42 +01:00
makefu
72cd32c0bc
ma nextgum.r becomes gum.r 2018-11-05 16:22:39 +01:00
lassulus
82a97181d6 nixpkgs: 06fb025 -> bf7930d 2018-11-05 11:30:48 +01:00
lassulus
100ca928ad nixpkgs: 06fb025 -> bf7930d 2018-11-05 10:33:28 +01:00
lassulus
fbbb800cbe nixpkgs: 81f5c26 -> 06fb025 2018-11-04 21:46:32 +01:00
lassulus
e39e8318b6 l: prism.r -> archprism.r, new prism.r 2018-11-04 18:32:14 +01:00
jeschli
8bfa2bbfc5 j reagenzglas: remove 2018-11-02 10:10:29 +01:00
tv
550f8fce25 krebs.tinc: add tincUpExtra 2018-10-30 22:47:57 +01:00
lassulus
f130c335de Merge remote-tracking branch 'ni/master' 2018-10-30 19:54:22 +01:00
lassulus
228d4acd7b l: adopt kruck.r (palo) 2018-10-30 19:26:02 +01:00
tv
212bc39249 Merge remote-tracking branch 'prism/master' 2018-10-27 15:02:39 +02:00
tv
2751c1c3ad git-preview: add GIT_PREVIEW_MERGE_STRATEGY 2018-10-23 19:26:37 +02:00
lassulus
1ed73d2d90 nixpkgs: 21293d2 -> 81f5c26 2018-10-18 17:45:25 +02:00
lassulus
031a832b5c l: add eve.r 2018-10-11 22:38:32 +02:00