diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-01-04 03:48:24 +0100 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-01-04 03:50:04 +0100 |
| commit | e2785ad2dedc04166f8d5f27b87a1e003e41b2bc (patch) | |
| tree | e30955abf28ad6479a0963ff39aae8753a5a372c | |
| parent | blog aliases servername. (diff) | |
| download | webdav_server-e2785ad2dedc04166f8d5f27b87a1e003e41b2bc.tar.gz webdav_server-e2785ad2dedc04166f8d5f27b87a1e003e41b2bc.tar.xz | |
Hopefully fix blog.
| -rw-r--r-- | modules/blog/manifests/instance.pp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/modules/blog/manifests/instance.pp b/modules/blog/manifests/instance.pp index 39540c9..0bbdb32 100644 --- a/modules/blog/manifests/instance.pp +++ b/modules/blog/manifests/instance.pp @@ -9,6 +9,7 @@ define blog::instance ( ) { $root = "${blog::blog_root}/${title}" + $safe_title = base64('encode', $blog_title) vcsrepo { $root: ensure => latest, @@ -86,14 +87,14 @@ define blog::instance ( } $main_conf = { - "${blog_title} - server" => $default + $domain_conf, + "${safe_title} - server" => $default + $domain_conf, } create_resources(nginx::resource::server, $main_conf) if $domain_aliases { $alias_conf = { - "${blog_title} - aliases" => $default + { + "${safe_title} - aliases" => $default + { server_name => $domain_aliases, server_cfg_append => { 'return' => '301 $scheme://blog.hornquist.se$request_uri', @@ -103,29 +104,29 @@ define blog::instance ( create_resources(nginx::resource::server, $alias_conf) } - nginx::resource::location { "${blog_title} - server - /": + nginx::resource::location { "${safe_title} - server - /": location => '/', try_files => ['$uri', '$uri/', '=404'], index_files => [], ssl => true, autoindex => on, - server => [ "${blog_title} - server", ] + server => [ "${safe_title} - server", ] } - nginx::resource::location { "${blog_title} - server - php": + nginx::resource::location { "${safe_title} - server - php": location => '~ \.php$', fastcgi_params => 'snippets/fastcgi-php.conf', fastcgi => 'unix:/run/php/php-fpm.sock', ssl => true, - server => [ "${blog_title} - server", ], + server => [ "${safe_title} - server", ], } - nginx::resource::location { "${blog_title} - server - ht": + nginx::resource::location { "${safe_title} - server - ht": location => '~ /\.ht', location_cfg_append => { deny => 'all' }, index_files => [], ssl => true, - server => [ "${blog_title} - server", ], + server => [ "${safe_title} - server", ], } } } |