Commit 08e9e0d0 authored by mh's avatar mh
Browse files

migrate away from hiera stuff

parent a1ea8afb
......@@ -206,7 +206,7 @@ define webhosting::common(
}
}
if hiera('use_nagios',false) and ($nagios_check != 'unmanaged') {
if $nagios_check != 'unmanaged' {
if $nagios_check == 'ensure' {
$nagios_ensure = $ensure
} else {
......
......@@ -67,7 +67,7 @@ define webhosting::php::mediawiki(
$spam_protection = false,
$wiki_options = {},
$autoinstall = true,
$squid_servers = hiera('reverse_proxies','absent'),
$squid_servers = 'absent',
$file_extensions = 'absent',
$extensions = 'absent',
$language = 'de',
......
......@@ -4,7 +4,8 @@ define webhosting::user_scripts::manage(
$scripts = 'ALL',
$sftp_user,
$web_group,
$options = {}
$options = {},
$user_scripts_help = 'https://wiki.immerda.ch/index.php/WebhostingUserScripts'
){
$scripts_path = $base_path ? {
'absent' => "/var/www/vhosts/${name}/scripts",
......
# This is the configuration file to adjust permissions in your webdirectory.
#
# This file contains a few information about what you can do. For further
# information please have a look at: <%= scope.function_hiera('webhosting_user_scripts_help', 'https://wiki.immerda.ch/index.php/WebhostingUserScripts') %>
# information please have a look at: <%= user_scripts_help %>
#
# A few things to note:
#
......@@ -48,7 +48,7 @@
# be reverted when these scripts run.
#
# 8. We do a lot to prevent that you can do anything nasty with that script. If
# you find something to trick us, please let us know immediately: <%= scope.function_hiera('webhosting_user_scripts_admin_address','admin@immerda.ch') %>
# you find something to trick us, please let us know immediately: <%= user_scripts_admin_address %>
#
# The following example will show you a configuration to do the following changes:
# * The folders cms, include and the file index.php will only be readable.
......@@ -78,4 +78,4 @@
- <%= path %>
<% end
end
end -%>
\ No newline at end of file
end -%>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment