diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-01-03 22:53:06 +0100 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-01-03 22:58:24 +0100 |
| commit | e0df4ae947ee5d7512379f5467750f77a34ababd (patch) | |
| tree | 18d7544efa079c745a832cff7041505dba6e5d64 | |
| parent | temporarily remove data directory. (diff) | |
| download | webdav_server-e0df4ae947ee5d7512379f5467750f77a34ababd.tar.gz webdav_server-e0df4ae947ee5d7512379f5467750f77a34ababd.tar.xz | |
Fix blog.
| -rw-r--r-- | manifests/site.pp | 2 | ||||
| -rw-r--r-- | modules/blog/manifests/init.pp (renamed from modules/blog/manifests/blog.pp) | 0 | ||||
| -rw-r--r-- | modules/blog/manifests/instance.pp | 2 | ||||
| -rw-r--r-- | modules/blog/templates/settings.php.epp | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/manifests/site.pp b/manifests/site.pp index 1097af3..92c907b 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -159,6 +159,7 @@ node 'hornquist.se' { # https://buddy.works/blog/how-deploy-projects-with-git include ::blog + nsupdate { 'hornquist.se': ensure => present, nameserver => 'ns2.adrift.space', @@ -171,7 +172,6 @@ node 'hornquist.se' { $certname = 'hornquist' - service { 'php7.4-fpm': ensure => running, enable => true, diff --git a/modules/blog/manifests/blog.pp b/modules/blog/manifests/init.pp index 9b5f050..9b5f050 100644 --- a/modules/blog/manifests/blog.pp +++ b/modules/blog/manifests/init.pp diff --git a/modules/blog/manifests/instance.pp b/modules/blog/manifests/instance.pp index dfe95be..9fd793a 100644 --- a/modules/blog/manifests/instance.pp +++ b/modules/blog/manifests/instance.pp @@ -5,7 +5,7 @@ define blog::instance ( String $subtitle = '', Optional[String] $vcs_repo = undef, Optional[String] $domain = undef, - Optional[String] $domain_aliases = undef, + Optional[Array[String]] $domain_aliases = undef, ) { $root = "${blog::blog_root}/${title}" diff --git a/modules/blog/templates/settings.php.epp b/modules/blog/templates/settings.php.epp index 8f2e62d..c1ed2d7 100644 --- a/modules/blog/templates/settings.php.epp +++ b/modules/blog/templates/settings.php.epp @@ -2,8 +2,8 @@ String $title, String $subtitle, Boolean $has_comments = false, --%> -<?php +| -%> +<%= '<?php' %> # FILE MANAGED BY PUPPET $author = "<%= $author %>"; $blog_title = "<%= $title %>"; |