Merge branch 'master' of ssh://git.nordu.net/sunet-opssunet-ops-2015-02-19-v03

added fail2ban puppet

2 files changed, 75 insertions, 54 deletions

diff --git a/Makefile b/Makefile
index d612afc..4ef37e1 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,8 @@ upgrade:
 
 db:
 	@python ./fabfile/db.py > global/overlay/etc/puppet/cosmos-db.yaml
-	@git add global/overlay/etc/puppet/cosmos-db.yaml && git commit -m "update db" global/overlay/etc/puppet/cosmos-db.yaml
+	@git add global/overlay/etc/puppet/cosmos-db.yaml 
+	@git commit -m "update db" global/overlay/etc/puppet/cosmos-db.yaml
 
 tag: db
 	./bump-tag
diff --git a/global/overlay/etc/cosmos/keys/leifj-0AD478D6.pub b/global/overlay/etc/cosmos/keys/leifj-0AD478D6.pub
index 2bc06c0..96579b8 100644
--- a/global/overlay/etc/cosmos/keys/leifj-0AD478D6.pub
+++ b/global/overlay/etc/cosmos/keys/leifj-0AD478D6.pub
@@ -1,57 +1,77 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-mQENBFJK9qIBCACypED81H1N4YmhMJrb4uOtTDzo+lFZDVVOcK11+NhTFl+AZZFn
-WH/7UPn+q5ZZBd/IhONfb5QGw5FzTyBWHsbAteXgCvHAIyumwhQzhZnow6myyC6/
-MwDhomT5rb3MkCKCyQMNfj/yMgL6ZRsXVhlGOLMmOekRfKe2wiC5BhRaQQwPZPwg
-FS5D0Tro8Xfxjk98u8rNpQXi9walRAffRY+byhkPiBj0sVA2RXK9Dx2DL3EY0xx0
-7r6Qhs2XkbXNDDCHRuChhHSHwWC16VS9x7Nhfg2EwKqmMGRNREikjwzDl/aHKz+F
-XTLONdmc83sRyklqgH90f3na6s/RT5XTb08xABEBAAG0HUxlaWYgSm9oYW5zc29u
-IDxsZWlmakBtbnQuc2U+iQE+BBMBAgAoAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIe
-AQIXgAUCVC5LXQUJA8SIMQAKCRDXOtZDCtR41tNCB/0a/qYLTSDhst5ViuN9r+Bj
-P6N8E0lUDuqcgNzQHkItkt3wBQQQmC9k3XKpoG6fqP13Zh0KSLSICgl4tQIKm2es
-iQ7YkLvf3iJuAtH0ezIdXBUf7GPwQUu9LdbsXVSz7sedy2B60Jypp85PKBIXhTFP
+-----BEGIN PGP PUBLIC KEY BLOCK-----                                                                                                                                                              
+Version: GnuPG v1                                                                                                                                                                                 
+                                                                                                                                                                                                  
+mQENBFJK9qIBCACypED81H1N4YmhMJrb4uOtTDzo+lFZDVVOcK11+NhTFl+AZZFn                                                                                                                                  
+WH/7UPn+q5ZZBd/IhONfb5QGw5FzTyBWHsbAteXgCvHAIyumwhQzhZnow6myyC6/                                                                                                                                  
+MwDhomT5rb3MkCKCyQMNfj/yMgL6ZRsXVhlGOLMmOekRfKe2wiC5BhRaQQwPZPwg                                                                                                                                  
+FS5D0Tro8Xfxjk98u8rNpQXi9walRAffRY+byhkPiBj0sVA2RXK9Dx2DL3EY0xx0                                                                                                                                  
+7r6Qhs2XkbXNDDCHRuChhHSHwWC16VS9x7Nhfg2EwKqmMGRNREikjwzDl/aHKz+F                                                                                                                                  
+XTLONdmc83sRyklqgH90f3na6s/RT5XTb08xABEBAAG0HUxlaWYgSm9oYW5zc29u                                                                                                                                  
+IDxsZWlmakBtbnQuc2U+iQE+BBMBAgAoAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIe                                                                                                                                  
+AQIXgAUCVC5LXQUJA8SIMQAKCRDXOtZDCtR41tNCB/0a/qYLTSDhst5ViuN9r+Bj                                                                                                                                  
+P6N8E0lUDuqcgNzQHkItkt3wBQQQmC9k3XKpoG6fqP13Zh0KSLSICgl4tQIKm2es                                                                                                                                  
+iQ7YkLvf3iJuAtH0ezIdXBUf7GPwQUu9LdbsXVSz7sedy2B60Jypp85PKBIXhTFP                                                                                                                                  
 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
-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
-/lWFUPuDp70FZckwDjstnl15le7E
-=W4ov
+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
+H0v+VYVQ+4OnvQVlyTAOOy2eXXmV7sQ=
+=oRyH
 -----END PGP PUBLIC KEY BLOCK-----