summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-01-09 23:59:54 +0100
committermakefu <github@syntax-fehler.de>2018-01-09 23:59:54 +0100
commit4131fc8acacccee48908195178cee48d75953ab8 (patch)
tree5f62be49dc2bb8403358da6807b52abdfe58d86e /makefu
parent44d12e0037275dde5263d21017b83e1f146c86b4 (diff)
parent813535d526dd745ce00ba8dd4ebec85fc72080cc (diff)
Merge branch 'master' of http://cgit.ni/stockholm
Diffstat (limited to 'makefu')
-rw-r--r--makefu/2configs/bepasty-dual.nix5
-rw-r--r--makefu/2configs/collectd/collectd-base.nix4
-rw-r--r--makefu/2configs/nginx/euer.wiki.nix2
3 files changed, 7 insertions, 4 deletions
diff --git a/makefu/2configs/bepasty-dual.nix b/makefu/2configs/bepasty-dual.nix
index 701bf5b1d..890652285 100644
--- a/makefu/2configs/bepasty-dual.nix
+++ b/makefu/2configs/bepasty-dual.nix
@@ -28,7 +28,10 @@ in {
servers = {
"paste.r" = {
nginx = {
- serverAliases = [ "paste.retiolum" "paste.${config.krebs.build.host.name}" ];
+ serverAliases = [
+ "paste.${config.krebs.build.host.name}"
+ "paste.r"
+ ];
};
defaultPermissions = "admin,list,create,read,delete";
secretKeyFile = secKey;
diff --git a/makefu/2configs/collectd/collectd-base.nix b/makefu/2configs/collectd/collectd-base.nix
index 91e5216ad..9168d1fa9 100644
--- a/makefu/2configs/collectd/collectd-base.nix
+++ b/makefu/2configs/collectd/collectd-base.nix
@@ -10,7 +10,7 @@ let
ModulePath "${collectd-connect-time}/lib/${python.libPrefix}/site-packages/"
Import "collectd_connect_time"
<Module collectd_connect_time>
- target "wry.retiolum" "localhost" "google.com"
+ target "wry.r" "localhost" "google.com"
interval 30
</Module>
</Plugin>
@@ -19,7 +19,7 @@ let
LoadPlugin write_graphite
<Plugin "write_graphite">
<Carbon>
- Host "heidi.retiolum"
+ Host "heidi.r"
Port "2003"
Prefix "retiolum."
EscapeCharacter "_"
diff --git a/makefu/2configs/nginx/euer.wiki.nix b/makefu/2configs/nginx/euer.wiki.nix
index ef2c17c63..08bc5659f 100644
--- a/makefu/2configs/nginx/euer.wiki.nix
+++ b/makefu/2configs/nginx/euer.wiki.nix
@@ -76,7 +76,7 @@ in {
virtualHosts = {
"${ext-dom}" = {
#serverAliases = [
- # "wiki.makefu.retiolum"
+ # "wiki.makefu.r"
# "wiki.makefu"
#];
forceSSL = true;