From a9df4bba6c9f85c789375297388e459b8d982e04 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 5 Nov 2014 23:08:08 +0100 Subject: datasets --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'global/overlay/etc') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 7676e61..ee9afb2 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -100,6 +100,39 @@ node 'reep.tid.isoc.org' { } +node 'datasets.sunet.se' { + docker::image {'dockerfile/redis': } + docker::image {'docker.sunet.se/lobo2': } + docker::image {'docker.sunet.se/shibsp': } + docker::image {'docker.sunet.se/pound': } + file {'/opt/lobo2-redis-data': + ensure => 'directory', + } + file {'/etc/shibboleth/credentials': + ensure => 'directory', + } + docker::run {'redis': + image => 'dockerfile/redis', + volumes => ['/opt/lobo2-redis-data:/data'], + } + docker::run {'lobo2': + image => 'docker.sunet.se/lobo2', + env => ['BASE_URL=https://datasets.sunet.se'], + links => ['redis:redis'], + } + docker::run {'shibsp': + image => 'docker.sunet.se/shibsp', + links => ['lobo2:backend'], + volumes => ['/etc/shibboleth/credentials:/etc/shibboleth/credentials'], + env => ['SP_CONTACT=noc@sunet.se','SP_HOSTNAME=datasets.sunet.se','SP_KEYDIR=/etc/shibboleth/credentials'], + } + docker::run {'pound': + image => 'docker.sunet.se/pound', + links => ['shibsp:backend'], + ports => ['443:443'] + } +} + node 'docker.sunet.se' { docker::image {'registry': } docker::run {'registry': -- cgit v1.1 From 9eab59913bd6963b665f947df8b726c10a72e0b5 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 5 Nov 2014 23:37:25 +0100 Subject: pound it --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'global/overlay/etc') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 0a65f8d..a1abedd 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -136,10 +136,16 @@ node 'datasets.sunet.se' { node 'docker.sunet.se' { docker::image {'registry': } docker::run {'registry': + name => 'registry', image => 'registry', ports => ['80:5000'], volumes => ['/opt/registry:/tmp/registry'] } + docker::run {'pound': + image => 'leifj/pound', + links => ['registry:backend'], + ports => ['443:443'] + } } class docker_signer { -- cgit v1.1 From 2a43539d8c4eb0edcd5f3b050c7d6e5df465767f Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 5 Nov 2014 23:39:46 +0100 Subject: pound it --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'global/overlay/etc') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index a1abedd..0f5ab79 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -135,6 +135,7 @@ node 'datasets.sunet.se' { node 'docker.sunet.se' { docker::image {'registry': } + docker::image {'leifj/pound': } docker::run {'registry': name => 'registry', image => 'registry', -- cgit v1.1 From 1a27fb8b3bbf6f9ee2bd0db47c443722b05f782a Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 5 Nov 2014 23:44:49 +0100 Subject: pound it --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'global/overlay/etc') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 0f5ab79..c57d1f2 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -113,15 +113,18 @@ node 'datasets.sunet.se' { } docker::run {'redis': image => 'dockerfile/redis', + use_name => true, volumes => ['/opt/lobo2-redis-data:/data'], } docker::run {'lobo2': image => 'docker.sunet.se/lobo2', + use_name => true, env => ['BASE_URL=https://datasets.sunet.se'], links => ['redis:redis'], } docker::run {'shibsp': image => 'docker.sunet.se/shibsp', + use_name => true, links => ['lobo2:backend'], volumes => ['/etc/shibboleth/credentials:/etc/shibboleth/credentials'], env => ['SP_CONTACT=noc@sunet.se','SP_HOSTNAME=datasets.sunet.se','SP_KEYDIR=/etc/shibboleth/credentials'], @@ -137,10 +140,10 @@ node 'docker.sunet.se' { docker::image {'registry': } docker::image {'leifj/pound': } docker::run {'registry': - name => 'registry', - image => 'registry', - ports => ['80:5000'], - volumes => ['/opt/registry:/tmp/registry'] + use_name => true, + image => 'registry', + ports => ['80:5000'], + volumes => ['/opt/registry:/tmp/registry'] } docker::run {'pound': image => 'leifj/pound', -- cgit v1.1 From 491ea663136e78f9814d47ddc0aeee940e5b83c7 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 5 Nov 2014 23:49:58 +0100 Subject: pound it --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'global/overlay/etc') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index c57d1f2..e0be66b 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -139,7 +139,7 @@ node 'datasets.sunet.se' { node 'docker.sunet.se' { docker::image {'registry': } docker::image {'leifj/pound': } - docker::run {'registry': + docker::run {'sunetregistry': use_name => true, image => 'registry', ports => ['80:5000'], @@ -147,7 +147,7 @@ node 'docker.sunet.se' { } docker::run {'pound': image => 'leifj/pound', - links => ['registry:backend'], + links => ['sunetregistry:backend'], ports => ['443:443'] } } -- cgit v1.1 From 7852cb490e490acfa2ae87c8316a836d7c11b34c Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 5 Nov 2014 23:52:22 +0100 Subject: pound it --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'global/overlay/etc') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index e0be66b..b58faa3 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -148,6 +148,7 @@ node 'docker.sunet.se' { docker::run {'pound': image => 'leifj/pound', links => ['sunetregistry:backend'], + volymes => ['/etc/ssl:/etc/ssl'], ports => ['443:443'] } } -- cgit v1.1 From e50adc48200219d9c419c934c004241c73317830 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 5 Nov 2014 23:52:43 +0100 Subject: ferkrissakes --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'global/overlay/etc') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index b58faa3..a38914a 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -148,7 +148,7 @@ node 'docker.sunet.se' { docker::run {'pound': image => 'leifj/pound', links => ['sunetregistry:backend'], - volymes => ['/etc/ssl:/etc/ssl'], + volumes => ['/etc/ssl:/etc/ssl'], ports => ['443:443'] } } -- cgit v1.1 From b6446e0e4218219ebe442cd2a8a71da892833265 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Thu, 6 Nov 2014 13:11:04 +0100 Subject: mount cert directory --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'global/overlay/etc') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index a38914a..8bf7ebd 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -132,6 +132,7 @@ node 'datasets.sunet.se' { docker::run {'pound': image => 'docker.sunet.se/pound', links => ['shibsp:backend'], + volumes => ['/etc/ssl:/etc/ssl'], ports => ['443:443'] } } -- cgit v1.1 From c273d2a08c9b81fba95a4adfbfd6f2d382a82489 Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Mon, 10 Nov 2014 08:57:16 +0100 Subject: bump expire --- global/overlay/etc/cosmos/keys/ft-505152DD.pub | 42 +++++++++++++------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'global/overlay/etc') diff --git a/global/overlay/etc/cosmos/keys/ft-505152DD.pub b/global/overlay/etc/cosmos/keys/ft-505152DD.pub index 433fd6d..bf3c670 100644 --- a/global/overlay/etc/cosmos/keys/ft-505152DD.pub +++ b/global/overlay/etc/cosmos/keys/ft-505152DD.pub @@ -8,13 +8,13 @@ s8CiC82VftOr/QWKNys+kTGMgv0rpBgZ0ZmNe4qKTBKrVlzESMD/bWOVga70Rfsp MRY0cKK/V6gUDvaGtivg06SJNJzup8XzLYIclgwU3+U7c7YlseH7sUQlMUJ+Q2ij c+P3EkLNU2IOrJ/m9QwHl2EYG0GDaKz5IQGZABEBAAG0I0ZyZWRyaWsgVGh1bGlu IDxmcmVkcmlrQHRodWxpbi5uZXQ+iQE+BBMBCgAoAhsDBgsJCAcDAgYVCAIJCgsE -FgIDAQIeAQIXgAUCU4LqJwUJAi5ZNQAKCRAZjBr9UFFS3Q7UCACOApsR4fqVXcZF -49df+DxlGXLLzjiIL9dezduTcFqGAxFUCqC/hnw26UKmvUTshYvnUC336FCdg2u7 -oOxIE+u9+In3M8sqnNWax0lBG/Y3Gmk4YwJH1cL1phXwFDh4xU2xrGPS1hkVOtUO -l8GEB+v+l9P/WgMMPbdNQr/J4UnlZ7jZpeE7QadbvCE7q1U1Rw9wYG9o5c/BzQ/X -htQz/oedmZlyyftHppAL3jGjNWnSWf042hn9nFsPLpJjEXWy+XVo0pQOBfitt+Oj -sap1DEyuAFqEwbVIQyGCTyXIwo88VnLxZ6EkR9VvX3RnccVr03izqk1JoULkmLh9 -USHxrBtCiQEcBBABCgAGBQJSQ+AeAAoJEE7yk05OqkIyTswH/jmbf6BKVwhpYNZz +FgIDAQIeAQIXgAUCVGBu5gUJAwvd7AAKCRAZjBr9UFFS3SuaCACjOYwTuJAQVZof +CEBW2ZAfYViQo5CtOUszDJFWS25uVRn60DyNkNjs2l4ZuzKtASzdxRJkV2y4a8rN +raCF7GTQbzGnVrS2YuqZlfUBZxktbEvIxWlpr5ZplkibV9rB3jvtze44t+p5k1YZ +mjdbenmurX/w9g5lAROPkulDjwhyEAxwaL+hwSHOupNjwS/QUAY0TavzmzMnbopu +cfkpmuPv4zV9+SrkFcmv8pP9IRf6ehUsz0J3cqqI+I9aMcZkX3TaEPfqYysbkfhX +bJTR4Z6rOiJEtoC7XmCrxjRmZXlxGL1kMHMRmI4UjCVCYmkzzoC+dSpQnXNhGqAv +A5s78au0iQEcBBABCgAGBQJSQ+AeAAoJEE7yk05OqkIyTswH/jmbf6BKVwhpYNZz S/nlKGIhf0R0g4LPPOep25EwJfmUk54Mvi48/TBdZ9cy5Kwj3nlTXvviC72c7KvI ViZuZwO+jv0JOr2H5+xtT2zfWOeYFK0vlHPk1dUI++h84bnM/DCyGWdP6My1leRN VRySQI9E4NfHI03EN8fhoSKwHXfwrZOu5O8/8t4odJjo9IhnRiPvqFDqfbKDby+X @@ -102,23 +102,23 @@ k04nWrAZbouOoNo+rx6iXNnShzHhmcnrNrBDL9DN98CBhX2EqptfRV5TSX7R/3Hg OBE23QT7TxL2mIVTR8E64NmJWV9Nu5uvQXng6elNzp19zhT655aD6H+IBFVCq/pq j29gwHTwII5SUvqtRo8xqJXUnWW287SS8BDwbp/PcStGv0mPn41bwVUiHIjlR3U7 5BdlZkEWfsrIXaB9QyhTIrfTvcIhzx+E+Rph9LMRmQARAQABiQElBBgBCgAPAhsM -BQJTguoABQkCLlkLAAoJEBmMGv1QUVLdwvAH/2a6O4YKBYomti04mqR0OUTnvfOd -/9QJqZVymv6ArHzVYiTF4VwHqjziW2P/rjzkpUWSIwG0z6B/AIcOz+E+Fv4u5r7b -S7k/iGwtfJ0ylEMpzBWOE9DeEw7zZ912U92zaBTJ1+2nz5IgcDnwpxV0mTfhf1Ah -/vQpzZUjD2lVEBfaGe+YzmC/IJG/WpUikxqxXgVclU3ecoEx5w87qfD02VT2l4Ck -o1dsmfwQcFaYnG5sayXpTqZl2ierAzLrBXPEpYoDTZqIJqAk9XlOW78ihLgv2O/J -b2lGiVf6Ev7cS///6zhfyKj0j3wa/xHffQuDa7r7TeUIsE3Qb8KbvtGr0Si5AQ0E +BQJUYG76BQkDC94HAAoJEBmMGv1QUVLdZzMH/jpMBYOB1hzYKnb9OGCHEkHYk853 +Ff/nC0k5QOEIm2hfArhomyZeGRdntybCMWQiQnTXpPhlVgYHFS4CBuGzRuNn7rjW +AK8K8QsJwDKxwzzhmxiAmJkBZBugCXTpWh6vullvtSgo3z5U/zubPkozb3nfUocq +69WGiARQa0SoMTglTZCr08AJ+05cLPULEJScSxT0CGj8RwITksbIXoApXikPOF9o +SK1ujXAeP21NhtDDZ/rOXRsxuNQZoX/P5VEs8doN3uW1QCrmR0HHlOY/sd00Acm5 +RogZt0C12MPPPJHpAzb1yGSQ+d9BCPVnEXiwpTrho6/AUuCS+p0RZaxXD7S5AQ0E UkMpcAEIAKeyRGk3FYkT9iANHejqwxbDCZtQnx/ZIlrSAd8cz59zHELbNA33/2ao lLFLUT1B165FtseljERS0ehfS9KuaJr9UAsOJAAymznVEGqrpiWtiq8/9FvSFnRn j9iCNOiwt27U95POKHqbBvI00XT6Bj3zsiDfWpdDK00X70bWhJj12AECrnaW7XvR BdNHC6bgHoaHj+kKczrHH7udjaiqWC+XbBgdUA4nf1b2vjL2QGFxWznVe8mph6GN qjIph/X4/MDQWy+EmRm4brCzl4QZIH3SUDMobIVld5284uacWaoCtqgt64pqMcgU -kN8o18cdtimfwREh9VbrqduqVcU7aDcAEQEAAYkBJQQYAQoADwIbIAUCU4LqGQUJ -Ai0OpgAKCRAZjBr9UFFS3YUGB/9Jxu6OcKYfegT0LNaEZwhg/P1OetqX5SQfuhgt -Jzvq3bogLQBI4InkRmCHR2KU6Hj5hjU9fRYXJ6JJS/ReceX2zcva+MCcHvtL/Qnp -B7Womq8fjtbzhsbNRxhlCXX3/V8gDxmgPTdQ5mLW4LHuvE18GXHgzllkKJ+XXbBb -JnA7/Yk+RI6G4s8mru1kj5Lb4R0/Io+0INnct6ZUUMHzAR1pSJD/tPS+Gh5tsDG9 -ijD9nCO+1soHkFl5vUO+aFGHgQkmXWaFUWBk/uCuDd08NDu/Ai5zGo1gt0yfPFgN -9fuL1QPLE+OLY3p83BDtDZdEzmOLqL42Ntr38IczD+Gdvci/ -=yrrA +kN8o18cdtimfwREh9VbrqduqVcU7aDcAEQEAAYkBJQQYAQoADwIbIAUCVGBvCAUJ +AwqTlQAKCRAZjBr9UFFS3S08CACvFmEp+bkbhEoHdgdDXjtVjrfoI5Hahy2hb4SL +BpzqkuGNf8VasO1h8Nf2YHbo5MUTptuEu7Nyt1jiIAhBDtgUuLZslGWIJ93G1p8Z +pY3SetOCJ/BSCztxTpv5SARXrGSOwa8G8q/+0Y77tlHm1cM5PjG3PhDcpiVq331Z +YEyjLP9UNMjpU03r3+2mIR1z7UinGl/hLToq2B5/k/vKH4crF6w+RS5trB6uvaKF +cK+tjwwZsNVrk/th14gEb62UmomCbr6pHtr2sXk7Jpd5WWdkkfYWIKEf+UZb0Icu +9Ynz6QuOn5YzHphkUTgCF9yLgnnonL4ammZDFdnWj2R2Talz +=FWBw -----END PGP PUBLIC KEY BLOCK----- -- cgit v1.1