From 7e60e65f9bfa95ab9ee1e7556aa242dec054c0ee Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Sat, 7 Jul 2018 23:16:26 +0300 Subject: [PATCH] First shot at adding perlresume. See https://github.com/metacpan/metacpan-puppet/issues/137 . Untested! --- hieradata/common.yaml | 6 ++++++ hieradata/env/production.yaml | 13 +++++++++++++ hieradata/nodes/lw-mc-05.yaml | 18 ++++++++++++++++++ hieradata/nodes/metacpan-dev.yaml | 3 +++ modules/metacpan/manifests/web/production.pp | 8 ++++++++ 5 files changed, 48 insertions(+) create mode 100644 hieradata/nodes/lw-mc-05.yaml diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 0463e3b7..ad002061 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -252,6 +252,12 @@ metacpan::crons::general: hour : 1 ensure : absent + perlresume: + cmd : "/home/%{hiera('metacpan::user')}/bin/perlresume-carton-exec cron/update.pl" + minute : 20 + hour : 3 + ensure : absent + swat_monitoring: cmd : "/bin/sh /home/%{hiera('metacpan::user')}/metacpan-monitoring/cron.sh" minute : 37 diff --git a/hieradata/env/production.yaml b/hieradata/env/production.yaml index ffd27c13..4e57ae62 100644 --- a/hieradata/env/production.yaml +++ b/hieradata/env/production.yaml @@ -62,6 +62,19 @@ metacpan::web::starman: starman_port: 5002 starman_workers: 1 + perlresume: + git_enable: true + starman_workers: 1 + git_source: 'https://github.com/vti/perlresume.org' + git_revision: 'master' + vhost_bare: true + vhost_aliases: + - 'perlresume.metacpan.org' + - "perlresume.lo.metacpan.org" + - "perlresume.%{hostname}.metacpan.org" + starman_port: 5003 + starman_workers: 1 + sco-redirect: git_enable: true starman_workers: 10 diff --git a/hieradata/nodes/lw-mc-05.yaml b/hieradata/nodes/lw-mc-05.yaml new file mode 100644 index 00000000..a3fb1c2b --- /dev/null +++ b/hieradata/nodes/lw-mc-05.yaml @@ -0,0 +1,18 @@ + +classes: + - metacpan_postgres::install_only + - metacpan_postgres::pgpass + - minion_queue + +minion_queue::service::workers: 10 +minion_queue::service::ensure: running +minion_queue::service::enable: true + + +metacpan::crons::general: + perlresume: + ensure : present + +metacpan::crons::general: + metacpan_sitemaps: + minute : 25 diff --git a/hieradata/nodes/metacpan-dev.yaml b/hieradata/nodes/metacpan-dev.yaml index 591048b6..264fc968 100644 --- a/hieradata/nodes/metacpan-dev.yaml +++ b/hieradata/nodes/metacpan-dev.yaml @@ -52,5 +52,8 @@ metacpan::fw_ports: github-meets-cpan: port: 5002 source: '0.0.0.0/0' + perlresume: + port: 5003 + source: '0.0.0.0/0' starman::config::plack_env: development diff --git a/modules/metacpan/manifests/web/production.pp b/modules/metacpan/manifests/web/production.pp index b4d124ab..79cffc35 100644 --- a/modules/metacpan/manifests/web/production.pp +++ b/modules/metacpan/manifests/web/production.pp @@ -39,5 +39,13 @@ notify => Starman::Service['github-meets-cpan'], } + file { "/home/${user}/perlresume/environment.json": + ensure => file, + owner => $user, + group => $group, + source => "puppet:///private/perlresume/environment.json", + require => Metacpan::Gitrepo['gitrepo_perlresume'], # after repo created + notify => Starman::Service['perlresume'], + } }