From 1fea37985d2777271e163c743e7364b62ed0e6c0 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Mon, 28 Sep 2015 11:59:28 +0200 Subject: serve static web artifacts from github repo --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'global/overlay/etc/puppet/manifests/cosmos-site.pp') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index ccf1bd9..aaa8bb4 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -1,4 +1,4 @@ -# This manifest is managed using cosmos + This manifest is managed using cosmos Exec { path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", @@ -928,6 +928,16 @@ node 'web-a1.sunet.se' { volumes => ['/data/kalturabilling/kalturausers.csv:/kalturausers.csv'], env => ['KALTURA_CUSTOMERS=/kalturausers.csv','SCRIPT_NAME=/kalturabilling'] } + vcsrepo { '/data/static_sunet_se': + ensure => present, + provider => git, + source => 'git://github.com/SUNET/static_sunet_se.git' + } -> + sunet::docker_run {'static_sunet_se': + image => 'docker.sunet.se/static-cors', + ports => ['8002:80'], + volumes => ['/data/static_sunet_se:/usr/local/apache2/htdocs'] + } } node 'web-a2.sunet.se' { @@ -937,6 +947,16 @@ node 'web-a2.sunet.se' { sp_hostname => 'www.sunet.se', mysql_user => 'wordpress' } + vcsrepo { '/data/static_sunet_se': + ensure => present, + provider => git, + source => 'git://github.com/SUNET/static_sunet_se.git' + } -> + sunet::docker_run {'static_sunet_se': + image => 'docker.sunet.se/static-cors', + ports => ['8002:80'], + volumes => ['/data/static_sunet_se:/usr/local/apache2/htdocs'] + } } node 'ca.sunet.se' { -- cgit v1.1 From 9104153e4799eb415ddcc6711afa84b42b0fca56 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Mon, 28 Sep 2015 12:00:06 +0200 Subject: oops - accidentally deleted a # --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'global/overlay/etc/puppet/manifests/cosmos-site.pp') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index aaa8bb4..4d84c3f 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -1,4 +1,4 @@ - This manifest is managed using cosmos +# This manifest is managed using cosmos Exec { path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", -- cgit v1.1 From 492ef952aa8446bdc99c36ad6dad82f0ee83c12a Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Mon, 28 Sep 2015 12:33:33 +0200 Subject: update static data every 5 minutes --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'global/overlay/etc/puppet/manifests/cosmos-site.pp') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 4d84c3f..2f72cea 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -933,6 +933,11 @@ node 'web-a1.sunet.se' { provider => git, source => 'git://github.com/SUNET/static_sunet_se.git' } -> + cron {'update-static': + command => "cd /data/static_sunet_se && git pull -q", + user => root, + minute => '*/5' + } -> sunet::docker_run {'static_sunet_se': image => 'docker.sunet.se/static-cors', ports => ['8002:80'], @@ -952,6 +957,11 @@ node 'web-a2.sunet.se' { provider => git, source => 'git://github.com/SUNET/static_sunet_se.git' } -> + cron {'update-static': + command => "cd /data/static_sunet_se && git pull -q", + user => root, + minute => '*/5' + } -> sunet::docker_run {'static_sunet_se': image => 'docker.sunet.se/static-cors', ports => ['8002:80'], -- cgit v1.1 From f9f9de7f5252c72607d2781a46bf341d02a27877 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Tue, 29 Sep 2015 10:34:29 +0200 Subject: new key for lordahl --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'global/overlay/etc/puppet/manifests/cosmos-site.pp') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 2f72cea..3fe183e 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -761,6 +761,12 @@ class swamidops { user => 'root', name => 'anders@merlin' } + ssh_authorized_key {'lordahl-neo': + type => 'ssh-rsa', + key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQCnlZzX1O/zsoXJx8gdydJcqC94HhpgOO42BWHhXVpmxxrqSxLriClbcMFUDhNn2ldLkBtvG404cTbe+rChDNLf4kWGBGUXO/JwIamMVSdFf68ykaycEBmEKfp2CLGc/vN3ryZdSU+bqciDx9VUTIfTGCTHoMHFtUwp42g+DxY+AOccHnwprUg/yiwne4Owr3Y7MOE91mLCl0Sgg/MxOHM5IPScMeS2FDiWDKq7dNyKDDfc3P5WOIr1valBWooOkcu7wimV9QrSwTWv6seRQ6FrEnp7eaotrNhtouznpVCiuBMpw6m1bGX2tJRkU9cKKh4FsgIs6ysAfTvc6Ue1PJTB', + user => 'root', + name => 'anders.neo@lordal.se' + } ssh_authorized_key {'aslund-umu': type => 'ssh-rsa', key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQCZMok+obrCgHY0atsLp777lBrxvMYEHmHK0+DXHBnRBH9CK9gjquH3fmv/Eq1bHm4UUOOJ0zk67mVdFcOwX4p7XbxHolURLFPu1QBWgiT6vRGrWOthcDa1I5iSJ0ez7SBrtD4Si5juKq1T6mNVEbHn9NlOoGR4NVGQI1v90bywnhdT9m12Y487e4HYyjDE3G/S0v6Pkj4uaehrWHAbrgXYEkleuhGJesNQrfxDx31BZbqJs8wqZ9csgHaBgiiN/lplsZlL7GuHqytoSPKwVJ7EK/ZvFLir3IoP5G9IR0eUY4+SZUEjmxJL+JyBXGQJPJx1qIPiQZSb+38tBT2742Fx', -- cgit v1.1