Commit e175d4677370bfe330922432423c1b0906f4aa64

Authored by root ago
1 parent e17c2f1af9
Exists in master

web-proxy, web-server uses regex for node name

Showing 3 changed files with 23 additions and 10 deletions Side-by-side Diff

manifests/bmt-server.pp View file @ e175d46
... ... @@ -47,10 +47,10 @@
47 47 source => 'puppet:///modules/php/php.ini.webserver.dev',
48 48 }
49 49  
50   - vcsrepo { '/tmp/puppet':
  50 + vcsrepo { '/var/www/pikicast-web-ci':
51 51 ensure => latest,
52 52 provider => git,
53   - source => 'ssh://git@gitlab.pikicast.com:2222/piki_devops/puppet.git',
  53 + source => 'ssh://git@gitlab.pikicast.com:2222/Owen/pikicast-web-ci.git',
54 54 revision => 'master',
55 55 }
56 56 }
manifests/web-proxy.pp View file @ e175d46
1   -node 'KR-WEB-PROXY-01' {
  1 +node /^kr-web-proxy-\d+$/ {
2 2 include nginx
3 3  
4 4 file { '/etc/nginx':
5 5  
... ... @@ -21,13 +21,20 @@
21 21 ensure => directory,
22 22 recurse => true,
23 23 purge => true,
24   - before => File['httpd.conf'],
  24 + before => File['http.conf'],
25 25 }
26 26  
27   - file { 'httpd.conf':
28   - path => '/etc/nginx/conf.d/http.conf',
29   - ensure => present,
30   - source => 'puppet:///modules/nginx/http.conf.webproxy.real',
  27 + file { 'http.conf':
  28 + path => '/etc/nginx/conf.d/http.conf',
  29 + ensure => present,
  30 + source => 'puppet:///modules/nginx/http.conf.webproxy.real',
  31 + }
  32 +
  33 + vcsrepo { '/var/www/pikicast-web-ci':
  34 + ensure => latest,
  35 + provider => git,
  36 + source => 'ssh://git@gitlab.pikicast.com:2222/Owen/pikicast-web-ci.git',
  37 + revision => 'master',
31 38 }
32 39 }
manifests/web-server.pp View file @ e175d46
1   -node /^KR-WEB-\d+$/ {
  1 +node /^kr-web-\d+$/ {
2 2 include php
3 3  
4 4 file { '/etc/php-fpm.d':
... ... @@ -16,6 +16,12 @@
16 16 ensure => present,
17 17 source => 'puppet:///modules/php/php.ini.webserver.real',
18 18 }
19   -
  19 +
  20 + vcsrepo { '/var/www/pikicast-web-ci':
  21 + ensure => latest,
  22 + provider => git,
  23 + source => 'ssh://git@gitlab.pikicast.com:2222/Owen/pikicast-web-ci.git',
  24 + revision => 'master',
  25 + }
20 26 }