Commit graph

151 commits

Author SHA1 Message Date
Andreas Baldeau 9d9ff0a64c Aufräumen 2016-05-06 22:30:42 +02:00
Leo Krueger 8f5646efa8 Merge pull request #15 from ansemjo/patch-1
add GitLab VM
2016-04-01 10:59:38 +02:00
ansemjo 7262d2bc82 add GitLab VM
also copy-paste srv0{1,2} entries, to fix requirement "nach IP sortiert!"
2016-03-28 14:18:37 +02:00
Leo Krueger b8640b5aa3 add osterrade-ap4 2016-03-25 19:44:20 +01:00
Leo Krueger 628ef2b874 add osterrade-ap3 2016-03-25 19:33:45 +01:00
Leo Krueger 37f7b3051d correct typo 2016-03-25 18:55:28 +01:00
Leo Krueger c6455f7c7d add osterrade-ap2 2016-03-25 18:55:09 +01:00
Leo Krueger 64b7082778 Update static.conf 2016-03-24 09:09:47 +01:00
Leo Krueger f1f97fabbb Update static.conf 2016-03-13 02:13:57 +01:00
kpcyrd 217dcc7f16 Merge pull request #14 from devlg/master
Added new host 'pia'
2016-03-11 21:29:06 +01:00
Florian Strankowski 24e4f92050 Added new host 'pia' 2016-03-11 21:18:50 +01:00
Leo Krueger 558318cf86 correct typo
we really need automatic checking here
2016-02-17 14:16:57 +01:00
4ndr3 5652fecdf2 fux-fraplap MAC korrigiert 2016-02-08 21:02:19 +01:00
4ndr3 d5f5720fee fux_w_3g_12 hinzugefügt 2016-02-08 20:27:34 +01:00
4ndr3 2be56a6bf8 "host" verwegefügt 2016-01-19 21:52:47 +01:00
4ndr3 c88cdb36cd fux-mw-2g-seminar, fux-fraplap, fux-mw-3g-tanz
hinzugefügt
2016-01-19 21:52:03 +01:00
Leo Krueger ac0c696399 correct typo 2016-01-10 14:19:45 +01:00
Leo Krueger 35b558fcb7 Delete .DS_Store 2016-01-10 14:19:08 +01:00
Leo Krueger 981ff6ae79 Merge pull request #12 from herbrich/master
add host herbrich
2016-01-10 14:18:47 +01:00
Aleksandar Herbrich 390ba59df2 add host herbrich 2016-01-10 12:45:26 +01:00
Aleksandar Herbrich f3594c66b6 Merge pull request #1 from herbrich/herbrich-patch-1
add host jenniferherbrich1
2016-01-10 12:38:16 +01:00
Aleksandar Herbrich c501c4bd2d add host jenniferherbrich1 2016-01-10 12:33:50 +01:00
Leo Krueger 55c679e981 add 32c3 gw 2015-12-22 23:49:35 +01:00
4ndr3 b176932b91 Merge pull request #11 from sfof/patch-2
brachvogel hinzugefügt
2015-11-16 08:22:36 +01:00
sfof 5ec7b53031 Update static.conf 2015-11-15 23:44:32 +01:00
Andreas Baldeau 636a3cc0e4 Statische IP für lenny 2015-11-15 13:20:24 +01:00
4ndr3 85508c9d70 Merge pull request #10 from sfof/patch-1
Update static.conf
2015-11-15 01:28:49 +01:00
sfof 153b62fded Update static.conf 2015-11-08 18:08:26 +01:00
Leo Krueger b9a18f1212 add host cloud 2015-10-16 19:15:30 +02:00
4ndr3 1de475b1a1 veraltete Einträge entfernt & Einträge korrigiert 2015-09-25 21:39:02 +02:00
4ndr3 c0e16d6233 bb-werkhof-0-cpe5 & 18 hinzugefügt 2015-08-08 19:50:44 +02:00
Alexander 2eb6ec3d5b Flora NSM5s hinzugefügt 2015-04-17 22:51:16 +02:00
Leo Krueger b70de1ddb3 add testsessel 2015-03-09 00:45:49 +01:00
Leo Krueger 0fea985ed1 Merge pull request #8 from 7adietri/add-seven-ip
seven hinzugefügt
2015-01-20 15:16:16 +01:00
Alexander Dietrich 831a4eaecb seven hinzugefügt 2015-01-11 13:31:07 +01:00
kantorkel 39796432f2 Update static.conf
baracke > freipei
2015-01-07 11:01:42 +01:00
Andreas Baldeau ed8040dc84 IP für Datenkapsel auf dem 31C3 2014-12-28 15:58:48 +01:00
4ndr3 baeb0d251e rasfi hinzugefügt 2014-12-23 09:39:55 +01:00
Leo Krueger 551eac209a Delete dhcpd.conf 2014-12-13 18:02:39 +01:00
4ndr3 bba0ca8c74 srv01 & 02 hinzugefügt 2014-12-13 17:55:46 +01:00
4ndr3 b7d870b9dc IPs .2.x-.7x removed
Nicht pingbar und der IP block wird den GWs zugewiesen.
2014-12-13 17:51:49 +01:00
4ndr3 2b334332aa plateau3 hinzugefuegt 2014-12-12 21:50:10 +01:00
Andre Schmidt f42de6c30c bb-frappant-01-nsm5 & -02 hinzugefügt 2014-12-08 23:06:02 +01:00
4ndr3 e48e3d7344 monitoring1 hinzugefuegt 2014-12-05 23:07:49 +00:00
Leo Krueger 4221d44362 Merge pull request #7 from crazynet24/master
Update static.conf
2014-12-05 17:50:39 +01:00
crazynet24 97d6b1f93d Update static.conf 2014-12-05 16:01:55 +01:00
4ndr3 b3a616f7f4 plateau2 hinzugefügt 2014-11-26 00:11:31 +01:00
Andre Schmidt 846ae10884 blackspear hinzugefuegt 2014-11-14 22:29:13 +01:00
Leo Krueger 0e75bc5878 Add a fixed IP 2014-10-18 22:39:55 +02:00
Leo Krueger f02f770ec2 Only restart dhcp server if it was running before
so we do not interfere with check-gateway script that stops dhcp server if no vpn uplink is present
2014-10-01 22:49:13 +02:00