Mercurial > repos > other > Puppet
comparison manifests/templates.pp @ 331:f69e2d197302
Separate some certs to make migration easier
LetsEncrypt requires all domains on the cert to be accessible
when renewing. If some migrated and some didn't then it won't
work. Separating sites gives us more options for moving sites
author | IBBoard <dev@ibboard.co.uk> |
---|---|
date | Sun, 08 Mar 2020 19:56:26 +0000 |
parents | 0cccb75d7639 |
children | 7198cc4397d8 |
comparison
equal
deleted
inserted
replaced
330:0cccb75d7639 | 331:f69e2d197302 |
---|---|
586 letsencrypt_name => 'hiveworldterra.co.uk', | 586 letsencrypt_name => 'hiveworldterra.co.uk', |
587 custom_fragment => template("privat/apache/hwt.fragment"), | 587 custom_fragment => template("privat/apache/hwt.fragment"), |
588 } | 588 } |
589 website::https::multitld { 'forums.hiveworldterra': | 589 website::https::multitld { 'forums.hiveworldterra': |
590 proxy_4to6_ip => $proxy_4to6_ip, | 590 proxy_4to6_ip => $proxy_4to6_ip, |
591 letsencrypt_name => 'hiveworldterra.co.uk', | 591 letsencrypt_name => 'forums.hiveworldterra.co.uk', |
592 custom_fragment => template("privat/apache/forums.fragment"), | 592 custom_fragment => template("privat/apache/forums.fragment"), |
593 } | 593 } |
594 website::https::multitld { 'skins.hiveworldterra': | 594 website::https::multitld { 'skins.hiveworldterra': |
595 proxy_4to6_ip => $proxy_4to6_ip, | 595 proxy_4to6_ip => $proxy_4to6_ip, |
596 letsencrypt_name => 'hiveworldterra.co.uk', | 596 letsencrypt_name => 'hiveworldterra.co.uk', |
603 letsencrypt_name => 'hiveworldterra.co.uk', | 603 letsencrypt_name => 'hiveworldterra.co.uk', |
604 separate_log => true, | 604 separate_log => true, |
605 } | 605 } |
606 } | 606 } |
607 class bdstrikesite ($proxy_4to6_ip) { | 607 class bdstrikesite ($proxy_4to6_ip) { |
608 website::https::multitld { 'www.bdstrike': | 608 website::https::multitld { 'www.bdstrike': |
609 proxy_4to6_ip => $proxy_4to6_ip, | 609 proxy_4to6_ip => $proxy_4to6_ip, |
610 docroot_owner => $defaultusers::secondary_user, | 610 docroot_owner => $defaultusers::secondary_user, |
611 docroot_group => 'editors', | 611 docroot_group => 'editors', |
612 letsencrypt_name => 'bdstrike.co.uk', | 612 letsencrypt_name => 'bdstrike.co.uk', |
613 custom_fragment => template("privat/apache/bdstrike.fragment"), | 613 custom_fragment => template("privat/apache/bdstrike.fragment"), |
628 redir => 'https://bdstrike.co.uk/', | 628 redir => 'https://bdstrike.co.uk/', |
629 serveraliases => $aliases, | 629 serveraliases => $aliases, |
630 docroot => "${website::basedir}/bdstrike", | 630 docroot => "${website::basedir}/bdstrike", |
631 docroot_owner => $defaultusers::secondary_user, | 631 docroot_owner => $defaultusers::secondary_user, |
632 docroot_group => 'editors', | 632 docroot_group => 'editors', |
633 letsencrypt_name => 'bdstrike.co.uk', | 633 letsencrypt_name => 'strikecreations.com', |
634 separate_log => true, | 634 separate_log => true, |
635 } | 635 } |
636 cron { 'wordpress_cron': | 636 cron { 'wordpress_cron': |
637 # Run "php -f wp-cron.php" on a schedule so that we can auto-update | 637 # Run "php -f wp-cron.php" on a schedule so that we can auto-update |
638 # without giving Apache full write access! | 638 # without giving Apache full write access! |