Commit Graph

519 Commits

Author SHA1 Message Date
makefu
caf6ce1291 Merge remote-tracking branch 'cd/master' 2016-04-03 21:57:09 +02:00
tv
e1cd9fa013 tv: import mu 2016-03-31 03:58:51 +02:00
makefu
a8c7618699 Merge remote-tracking branch 'prism/master' 2016-03-20 00:03:52 +01:00
makefu
90ef4d08a1 k 3 ma: update to real tinc pubkey 2016-03-19 23:55:43 +01:00
lassulus
fda0262111 Merge remote-tracking branch 'cd/master' 2016-03-19 22:12:11 +01:00
lassulus
3883a9fce7 k 3 l: add fastpoke pubkey 2016-03-19 21:59:32 +01:00
tv
3bead2641e {nukular,darth}: fix addrs6 2016-03-17 12:03:15 +01:00
lassulus
4143f1d6ec k 3 l: add lass.pgp.pubkeys.default 2016-03-16 09:20:05 +01:00
lassulus
9e9bc01fc9 Merge remote-tracking branch 'gum/master' 2016-03-16 09:16:41 +01:00
makefu
61e312dff1 k 3 ma: expose pgp pubkeys 2016-03-16 08:35:06 +01:00
makefu
90150375a8 Merge remote-tracking branch 'cd/master' 2016-03-16 08:26:27 +01:00
makefu
57476fb24a Merge branch 'master' of gum:stockholm 2016-03-16 08:25:50 +01:00
makefu
be5a136464 k 3 ma: add default and brain 2016-03-16 08:25:26 +01:00
tv
9d16ea6145 krebs types += pgp-pubkey, user.pgp.pubkey 2016-03-16 02:03:17 +01:00
tv
91844576fd krebs.users.tv.pgp.pubkey: 2CAEE3B5 2016-03-16 00:49:32 +01:00
tv
2452d21173 Merge remote-tracking branch 'gum/master' 2016-03-16 00:13:58 +01:00
makefu
03a72ef958 add new retiolum short form to default hostnames 2016-03-15 23:56:05 +01:00
makefu
4ac537366c Merge branch 'master' of gum.krebsco.de:stockholm 2016-03-15 23:55:30 +01:00
makefu
fa67e6ff08 k 3 nginx: add default404 option
the default behavior is not changed but if the default does not apply
to your use-case you now can change it
2016-03-15 23:54:53 +01:00
tv
13df24f8f0 krebs.backup: use krebs.on-failure 2016-03-15 15:59:05 +01:00
tv
e3f0ca7137 krebs.on-failure: init 2016-03-15 15:58:45 +01:00
lassulus
cbe70e8c39 l 3 newsbot-js -> k 3 newsbot-js 2016-03-15 14:37:46 +01:00
lassulus
72939a2d6f Merge remote-tracking branch 'gum/master' 2016-03-15 14:14:29 +01:00
lassulus
db3dd77f6d Merge remote-tracking branch 'cd/master' 2016-03-15 14:14:18 +01:00
lassulus
6d84a00fa6 k 3 l: add .r alias to echelon 2016-03-15 13:22:56 +01:00
makefu
2e317bfe74 ma 2: use tinc-pre per default 2016-03-15 13:20:14 +01:00
makefu
abf899f521 k 3 makefu: add hosts near to my heart <3 2016-03-11 02:11:39 +01:00
makefu
1db28fe74d k 3 retiolum: pigstarter -> [ prism cd ] 2016-03-11 01:33:23 +01:00
makefu
c61496e77e Merge branch 'master' of gum.krebsco.de:stockholm 2016-03-10 10:16:11 +01:00
makefu
dcf8e3fb32 Merge remote-tracking branch 'cd/master' 2016-03-10 08:03:41 +01:00
makefu
ef97cc848f ma 1 omo: replace crypt2 2016-03-08 18:35:32 +01:00
makefu
533c3c07b7 add darth 2016-03-06 20:56:32 +01:00
makefu
2fd7d1b1ab Merge remote-tracking branch 'cd/master' 2016-03-06 20:56:02 +01:00
lassulus
0115e0ee85 Merge remote-tracking branch 'cd/master' 2016-03-05 23:50:50 +01:00
tv
64f2e2075d krebs.exim-smarthost to-lsearch: append \n to each entry 2016-03-05 20:33:19 +01:00
tv
421f346257 krebs.exim-smarthost.dkim: support multiple domains 2016-03-05 20:33:19 +01:00
tv
08146e4834 krebs.exim-smarthost: add DKIM support to remote_smtp 2016-03-05 19:53:54 +01:00
tv
fdebe33d41 krebs.nginx: don't include (redundant) mime.types 2016-03-05 12:58:10 +01:00
tv
54129c440e krebs os-release: init 2016-03-05 12:40:20 +01:00
tv
89f731a898 krebs.exim-*: add empty keep_environment 2016-03-05 11:46:30 +01:00
tv
ffa1a1e456 s/makeSearchPath "bin"/makeBinPath/g 2016-03-03 19:45:46 +01:00
lassulus
1ba917c333 k 3 nginx: add ssl options 2016-03-03 00:25:11 +01:00
lassulus
ef8ed48b1c Merge remote-tracking branch 'gum/master' 2016-03-02 20:51:37 +01:00
makefu
db72d5911f Merge remote-tracking branch 'cd/master' 2016-02-28 02:26:44 +01:00
makefu
9af9b562b5 k 3 default: add via to gum, fix wry pubkey 2016-02-28 02:24:52 +01:00
makefu
217c4840d8 k 3 bepasty: create build environment for recursive package inclusion 2016-02-28 01:11:21 +01:00
lassulus
024de57e7b Merge remote-tracking branch 'cd/master' 2016-02-27 17:28:46 +01:00
tv
8c859335a8 krebs.nginx: s/optionSet/submodule/ 2016-02-27 17:23:59 +01:00
tv
9db6d9db71 krebs.hosts.{gum,ire}.nets.retiolum.via = internet 2016-02-27 15:48:58 +01:00
tv
94154606cb tv wu-binary-cache: init 2016-02-27 15:23:21 +01:00
tv
2ea539c80f krebs.setuid.*.mode: use mergeOneOption 2016-02-27 13:10:59 +01:00
lassulus
cfe5687ca3 k 3 lass: add .r alias to all host for exim 2016-02-22 01:13:26 +01:00
tv
a73eaae18c krebs.exim*: admit *.r 2016-02-21 22:08:30 +01:00
tv
de5de37a12 krebs.dns.providers: attrsOf unspecified -> attrsOf str 2016-02-21 21:52:05 +01:00
tv
67e5fddc0b krebs.users.krebs: init 2016-02-21 07:39:24 +01:00
tv
e3ddf995e9 krebs types.secret-file: owner-name -> owner :: user 2016-02-21 07:18:13 +01:00
tv
05be525be6 krebs.types.user: add uid :: int 2016-02-21 06:56:57 +01:00
tv
b5fbca3a36 krebs.secret: init 2016-02-21 05:27:37 +01:00
tv
1226a20038 krebs.build.populate fetch_git: checkout with force 2016-02-20 02:02:08 +01:00
tv
a607671662 krebs.build.populate: allow overriding ssh 2016-02-20 02:02:08 +01:00
tv
47ef169276 krebs.hosts.*: set owner 2016-02-20 02:02:07 +01:00
tv
cb258d3990 Merge remote-tracking branch 'gum/master' 2016-02-19 14:30:39 +01:00
tv
bca88ce7c6 krebs.urlwatch: add hooksFile and per-url filter 2016-02-18 16:45:18 +01:00
tv
1de8d5c44d krebs.backup: talk about local and remote rsync 2016-02-18 02:49:00 +01:00
tv
8c264139b2 krebs.build: use $F5 to prefix verbose commands 2016-02-18 01:15:58 +01:00
tv
2d79335e34 tv.mail: wu -> nomic 2016-02-17 17:07:16 +01:00
makefu
ae3a6110c6 k 3 makefu/wolf: fix typo 2016-02-17 10:51:26 +01:00
tv
064d0111a0 krebs.build: refactor a bit 2016-02-16 06:59:00 +01:00
tv
43ed24ed66 Merge remote-tracking branch 'gum/master' 2016-02-15 18:52:05 +01:00
tv
ea910d7d99 buildbot: s/lib\.shell/shell/g 2016-02-15 18:46:19 +01:00
makefu
a94a4c4206 s 1 wolf: use config.krebs.lib 2016-02-15 17:43:30 +01:00
makefu
3ceff0ec29 Merge remote-tracking branch 'cd/master' 2016-02-15 17:07:48 +01:00
tv
b7a92f6388 *: make eval.config.krebs.build.host.name work everywhere 2016-02-15 16:34:50 +01:00
tv
8f520b19b6 don't try to mimic nixpkgs 2016-02-15 16:34:50 +01:00
makefu
0457cd1bb9 k 3 repo-sync: init module, add git dependency 2016-02-15 14:01:24 +01:00
tv
673853e092 RIP specialArgs.lib 2016-02-14 16:43:44 +01:00
tv
9f16d7ea71 krebs.lib: init 2016-02-14 16:20:10 +01:00
tv
e890eb244a krebs.setuid: init 2016-02-14 13:26:37 +01:00
tv
0e35bc5c19 wbob: fix addrs 2016-02-13 19:43:02 +01:00
tv
d38853027e krebs.nginx: default locations = [] 2016-02-13 16:07:01 +01:00
tv
411aec6bf9 deploy,install,populate: admit target SSH port 2016-02-13 16:03:40 +01:00
tv
2b6a54c31c Merge remote-tracking branch 'gum/master' 2016-02-11 23:59:07 +01:00
tv
8c87356aee krebs.retiolum.hosts*: bump description 2016-02-11 23:50:52 +01:00
makefu
5e8b9fd3d7 k 3 tinc_graphs: use new tinc-hosts 2016-02-11 23:23:50 +01:00
makefu
524a009c1e Merge remote-tracking branch 'cd/master' 2016-02-11 23:18:00 +01:00
tv
6cbe21aac7 krebs.retiolum: make hostsPackage configurable 2016-02-11 23:16:08 +01:00
makefu
014cbb7598 Merge remote-tracking branch 'cd/master' 2016-02-11 21:31:15 +01:00
makefu
a649befbfa k 3 fetchWallpaper: scrap predicate, use unitConfig 2016-02-11 11:04:19 +01:00
tv
8b130a6628 krebs.nixpkgs.allowUnfreePredicate: init 2016-02-10 19:06:32 +01:00
tv
e6ea4875d4 krebs.backup: admit plan.startAt 2016-02-08 12:15:00 +01:00
tv
8e93530796 Merge remote-tracking branch 'cloudkrebs/master' 2016-02-08 03:35:29 +01:00
tv
7a9f130c12 krebs: rm types.host.dc 2016-02-08 03:21:01 +01:00
tv
d98578e3e1 rm krebs.build.target 2016-02-08 01:07:03 +01:00
tv
14afbfef12 krebs.backup: use aliases instead of addrs4 2016-02-08 00:31:26 +01:00
tv
8a1ddc5e9b krebs.backup.plans.*.enable.default = true 2016-02-07 23:48:34 +01:00
tv
071194c394 krebs.backup: DRY up push and pull 2016-02-07 22:20:38 +01:00
tv
d01c6f9dbc krebs.backup: don't append .{pull,push} to service name 2016-02-07 16:09:46 +01:00
tv
00525dc0ef krebs.backup.plans.*.startAt: null disables timer 2016-02-07 16:08:07 +01:00
tv
4c40eba816 krebs: add localhost to knownHosts 2016-02-07 15:58:49 +01:00
tv
f1ebd4e4e1 krebs knownHosts: add-port everywhere 2016-02-07 06:43:26 +01:00
tv
b746dd0936 krebs.backup: ensure link dest exists 2016-02-07 06:24:04 +01:00
tv
076f93bc02 mu: 10.243.20.01 -> 10.243.20.1 2016-02-07 06:24:04 +01:00
tv
02ad327081 krebs.backup writeDash* -> pkgs 2016-02-07 06:24:04 +01:00
tv
949f466cf7 tv: s/_/-/g in usernames 2016-02-07 06:24:04 +01:00
tv
f68c977a20 tv: define config.krebs.hosts.*.nets.gg23.ssh.port 2016-02-07 06:24:04 +01:00
tv
01dbc54c32 krebs.backup: determine fastest address 2016-02-07 06:24:04 +01:00
tv
29746aec06 krebs.{backup.plans,hosts,users}.*.name: add default value 2016-02-06 18:54:01 +01:00
lassulus
fe586d704e Merge remote-tracking branch 'cd/master' 2016-02-06 18:45:38 +01:00
tv
c784d271c5 tv: adopt mu 2016-02-06 18:38:51 +01:00
tv
9742953ee9 tv: add cgit.*.r aliases 2016-02-06 16:53:35 +01:00
tv
fbf92edb0e Merge remote-tracking branch 'gum/master' 2016-02-06 16:24:47 +01:00
tv
b16bfb9c99 tv: add .i and .r TLDs 2016-02-06 16:22:13 +01:00
tv
c4655c3baa krebs.dns.providers: add i and r 2016-02-06 16:22:13 +01:00
tv
171df3acbe tv: adopt kaepsele 2016-02-06 16:15:25 +01:00
tv
a1f7f5e510 krebs: DRY up shorts of the networking.extraHosts generator 2016-02-06 15:57:43 +01:00
tv
df89fb7e91 krebs.retiolum: don't generate extraHosts 2016-02-06 15:43:24 +01:00
tv
23c7c10f5a krebs.retiolum.hosts: change type to attrsOf host 2016-02-06 15:11:30 +01:00
makefu
e402c8ce1d k 3 git.nix: flesh out rules description 2016-02-04 13:07:47 +01:00
tv
d739448ab9 krebs.build.populate: cleanup (less) harder 2016-02-04 12:46:09 +01:00
makefu
e89f43de94 Merge 'cd/master' - update krebs.build.source 2016-02-04 11:16:17 +01:00
tv
b857a48632 krebs.build.populate: init and drop support for v1 2016-02-04 05:40:26 +01:00
makefu
f7d979b21f s 1 wolf: provide cgit mirror 2016-02-04 02:48:28 +01:00
tv
e2a922dd7d Merge remote-tracking branch 'gum/master' 2016-02-04 01:31:21 +01:00
tv
cdb590be50 krebs.git.rules: specify type 2016-02-03 13:36:54 +01:00
tv
68655d1ddf krebs.git: remove trailing spaces 2016-02-03 11:32:58 +01:00
lassulus
0cd9c450f0 k 3 l: add ssh host key for dishfire 2016-02-01 16:18:17 +01:00
lassulus
55b99a6c05 l: add helios as new system 2016-02-01 15:55:41 +01:00
lassulus
8b5523b7f4 k 3 l: declare pubkeys inline 2016-02-01 15:44:01 +01:00
lassulus
873d00042b k 3 l: remove dead hosts 2016-02-01 15:41:18 +01:00
lassulus
b7e2a64c32 Merge remote-tracking branch 'gum/master' 2016-02-01 15:19:04 +01:00
lassulus
72dc2dd7fa Merge remote-tracking branch 'cd/master' 2016-02-01 15:17:16 +01:00
tv
c3c4aac670 make deploy2: deploy using nixos-rebuild switch 2016-02-01 03:32:30 +01:00
makefu
440e78fc99 makefu: init wbob 2016-01-19 20:49:36 +01:00
tv
98be119acd krebs.urlwatch: bump compatibility to urlwatch-2
configFile is the default configuration urlwatch generates.
2016-01-17 21:49:18 +01:00
tv
2ae2bdc586 Merge remote-tracking branch 'gum/master' 2016-01-14 16:39:34 +01:00
lassulus
3f4cec9196 Merge remote-tracking branch 'cd/master' 2016-01-10 12:21:01 +01:00
tv
8647055f0c krebs.backup: add TODOs 2016-01-05 23:09:05 +01:00
tv
b44615eebe tv backup: wu:/home → xu:/bku/wu-home @ 05:00 2016-01-05 22:52:35 +01:00
tv
e09559bb78 krebs.backup.plans.*.{snapshots,startAt} += default 2016-01-05 21:47:55 +01:00
lassulus
0ed16606b2 Merge remote-tracking branch 'bobby/master' 2015-12-30 18:20:35 +01:00
miefda
eba696c5d2 miefda: init with bobby 2015-12-30 18:15:11 +01:00
lassulus
9b890750e2 Merge remote-tracking branch 'gum/master' 2015-12-30 17:16:05 +01:00
lassulus
f16742895c l: add new host dishfire 2015-12-30 17:14:31 +01:00
makefu
c625c7d422 Merge remote-tracking branch 'cd/master' 2015-12-30 14:58:20 +01:00
tv
b9c4a5e4a0 exim-retiolum: move assert to proper location 2015-12-30 14:54:04 +01:00
makefu
c962e8549e k 3 Reaktor: add channels Option 2015-12-30 11:29:28 +01:00
makefu
a8cb9d41bd s 1 test-all-krebs-modules: init 2015-12-30 02:45:47 +01:00
makefu
d574c0ef78 m 3 buildbot/master: add secrets 2015-12-30 01:38:33 +01:00
makefu
9abd00f6af k 3 makefu: add ssh pubkeys to hosts 2015-12-29 21:20:11 +01:00
makefu
72d821d96c Merge remote-tracking branch 'cd/master' 2015-12-28 21:00:27 +01:00
tv
5a9ccbef0a {tv 2 => krebs 3} backup 2015-12-28 19:43:31 +01:00
makefu
7bed1761bd m 3 Reaktor: now supports plugin infra see m/1/pornocauster 2015-12-26 11:41:44 +01:00
makefu
8f98ae9842 m 3 buildbot/master: use genid 2015-12-26 10:54:02 +01:00
makefu
ed4db71add Merge remote-tracking branch 'cd/master' 2015-12-26 10:51:18 +01:00
makefu
cef2be532b m 3 Reaktor: add workdir/state_dir 2015-12-26 10:44:56 +01:00
tv
763f0db52a {pkgs => lib}.genid 2015-12-26 05:58:37 +01:00
makefu
3adf78473d k 3 buildbot.master: refactor
see buildbot-standalone.nix in shared/2configs for the current buildbot config
2015-12-24 00:02:59 +01:00
makefu
6b7506dc67 k 3 buildbot: add rsync as explicit dep
do not be pure yet
2015-12-23 17:13:16 +01:00
makefu
1ef9af2c9a k 3 buildbot/master: send sigterm before sigkill for cleanup 2015-12-23 16:20:27 +01:00
makefu
9a38671871 k 3 buildbot: fix merge fuckup 2015-12-23 16:06:41 +01:00
makefu
b8ac3e2b8d Merge branch 'master' of gum.krebsco.de:stockholm 2015-12-23 11:20:42 +01:00
makefu
14ddb767eb k 5 mv krebs-ci test/infest-cac-centos7 2015-12-23 11:18:00 +01:00
makefu
dc8e270d2a m 3 buildbot: add new slow factory to complete integration test 2015-12-23 00:37:40 +01:00
makefu
f59080e76f m 3 buildbot: add new slow factory to complete integration test 2015-12-23 00:20:37 +01:00
makefu
56e8346faa k 5 krebs-ci: remove obsolete trap rm 2015-12-22 20:53:11 +01:00
makefu
bf1b6482ce mv makefu->krebs 3 buildbot 2015-12-22 19:36:22 +01:00
makefu
f7da5211f3 m 1 omo: init 2015-12-16 12:06:44 +01:00
makefu
b5eafa4c03 k 3 makefu: gum provides cgit.gum 2015-12-15 12:44:41 +01:00
makefu
9bc0c474ac m 2 Reaktor: add full profile 2015-12-14 17:12:51 +01:00
makefu
8114470587 Merge branch 'master' of gum:stockholm 2015-12-14 17:04:32 +01:00
makefu
781573b9dd k Zpubkeys: makefu* -> 3modules 2015-12-14 17:04:16 +01:00
makefu
83924b9b6c m 1 vbob:init 2015-12-14 14:33:06 +01:00
makefu
27ca97b78f k 3 retiolum: add extraConfig 2015-12-14 14:18:08 +01:00
makefu
1c17881aed k 3 fetchWallpaper: change predicate handling
a failed predicate does not result in a failed system service
it will just not download the remote
2015-12-13 13:50:39 +01:00
lassulus
25c1a1c5ee k 3 fetchWallpaper: default stateDir in /var 2015-12-12 19:37:52 +01:00
lassulus
1b9a044b44 l 3 fetchWallpaper -> k 3 fetchWallpaper 2015-12-12 19:37:13 +01:00
makefu
65cc52e01e Merge branch 'master' of pnp:stockholm
Conflicts:
	makefu/1systems/gum.nix
2015-12-04 10:16:09 +01:00
makefu
597f9e8597 k 3 tinc_graphs: add timeout 2015-12-03 20:39:29 +01:00
makefu
c7bb244bdf m 1 gum: provides mattermost via docker container 2015-11-27 23:10:44 +01:00
lassulus
f531e7e625 Merge remote-tracking branch 'pnp/master' 2015-11-21 14:25:02 +01:00
lassulus
a020268317 Merge remote-tracking branch 'cd/master' 2015-11-21 14:24:46 +01:00
tv
817a78c711 krebs: add cgit.stro.retiolum 2015-11-18 01:20:17 +01:00
lassulus
718c672e7c Merge remote-tracking branch 'cd/master' 2015-11-17 23:22:02 +01:00
makefu
84743dcd4a Merge remote-tracking branch 'cd/master' 2015-11-17 23:14:28 +01:00
makefu
0f54a195b7 acng: also add nar files to cache 2015-11-17 23:11:29 +01:00
makefu
a3e074094b k 3 apt-cacher-ng: add CAfile 2015-11-17 23:03:21 +01:00
makefu
b8dea556e9 k 3 shared: shack ip was already in use 2015-11-17 22:26:11 +01:00
makefu
5aed0a395b shared wolf: static ip, fix todo 2015-11-17 22:15:07 +01:00
tv
dba0db28d9 mv: init 2015-11-17 19:04:32 +01:00
makefu
5a450ad787 apt-cacher-ng is imported by krebs modules 2015-11-17 13:49:29 +01:00
makefu
4c26fb9383 k 3 apt-cacher-ng: fix whitespace 2015-11-17 13:29:56 +01:00
makefu
48c9789141 apt-cacher-ng: init package and module
once apt-cacher-ng arrives in nixos stable it will be removed from stockholm
2015-11-17 12:16:51 +01:00
makefu
dcf55255e6 Merge branch 'master' of pnp:stockholm 2015-11-15 20:18:35 +01:00
lassulus
d0a573c4c5 k 3 l: bump echelon internet addr 2015-11-14 17:54:08 +01:00
lassulus
a204949071 move testhosts to shared from lass 2015-11-13 13:05:19 +01:00
makefu
383d875023 tinc_graphs: always restart 2015-11-13 12:24:43 +01:00
lassulus
58eab5df69 l 3 go -> k 3 go 2015-11-13 01:18:30 +01:00
tv
bbcdef021a Merge remote-tracking branches 'mors/master' and 'pnp/master' 2015-11-07 10:38:27 +01:00
tv
8ad05d0f40 Merge remote-tracking branch 'cd/master' 2015-11-07 09:48:06 +01:00
tv
d590cf26cd xu: bump ssh key 2015-11-07 09:45:43 +01:00