diff options
| author | makefu <github@syntax-fehler.de> | 2013-01-14 14:46:22 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2013-01-14 14:46:22 +0100 |
| commit | dbe2d838ba6834788265029162b2dd7d82473335 (patch) | |
| tree | a4eb38f7fc91d91269b6f83453de62242c6ddc23 /cholerab/assets/structs.nojson | |
| parent | 5a782f6c8f7923f9f415afd504ce6e71acbc7fef (diff) | |
| parent | abf9916bc1add17888308877fa4eb9da330297ef (diff) | |
Merge branch 'master' of github.com:krebscode/painload
Conflicts:
god/temper/Makefile
god/temper/collectd-temper.sh
Diffstat (limited to 'cholerab/assets/structs.nojson')
| -rw-r--r-- | cholerab/assets/structs.nojson | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/cholerab/assets/structs.nojson b/cholerab/assets/structs.nojson deleted file mode 100644 index 4c084862..00000000 --- a/cholerab/assets/structs.nojson +++ /dev/null @@ -1,43 +0,0 @@ -"name": // default: random (gensym) - "type": "grafikkarte" - "location": "kremium" - "amount": 23 // default: 1 - "owner": "shack" // default: krebs - -"nebula": - "type": "location" - "owner": "tv" - -"tv": - "type": "owner" - -"grafikkarte": - "type": "type" - -"amount": - "type": "natural" - -"root-server": - "type": "irgend ein owner ist root" - -"shared": - "type": "alle owner sind root" - -"oxberg": - "type": "root-server" - "location": "de" - "ipv4-address": "84.23.80.172" - "isp": "euserv" - "ram": "512MiB" - -"ram": - "must-match": /[0-9]+[MGk]iB/ - -"kremium": - "location": "nebula" - "type": "root-server" - "shared": true - -"euserv": - "type": "ISP" - |