Commit 154f39b9 authored by mh's avatar mh
Browse files

introduce logmode feature

We are now able to select how apache should log accesses. These
modes are:

* default: as you would use it
* semianonym: no ips are logged for CustomLog, ErrorLog still logs
              ips
* anonym: no ips are logged for CustomLog, ErrorLog is sent to
          /dev/null
* nologs: all logs are sent to /dev/null
parent 0e7655c5
......@@ -11,6 +11,12 @@
# and run_uid and run_gid are used as vhost users
# run_uid: the uid the vhost should run as with the itk module
# run_gid: the gid the vhost should run as with the itk module
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
# - nologs: Send every logging to /dev/null
# - anonym: Don't log ips for CustomLog, send ErrorLog to /dev/null
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::modperl(
$ensure = present,
$uid = 'absent',
......@@ -22,6 +28,7 @@ define webhosting::modperl(
$password_crypted = true,
$domainalias = 'www',
$server_admin = 'absent',
$logmode = 'default',
$owner = root,
$group = 'sftponly',
$run_mode = 'normal',
......@@ -78,7 +85,8 @@ define webhosting::modperl(
apache::vhost::modperl{"${name}":
ensure => $ensure,
domainalias => $domainalias,
server_admin => 'absent',
server_admin => $server_admin,
logmode => $logmode,
group => $group,
allow_override => $allow_override,
do_includes => $do_includes,
......
......@@ -16,6 +16,12 @@
# - absent: $name will be passed
# - any: any authenticated ldap user will work
# - everything else will be used as a required ldap username
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
# - nologs: Send every logging to /dev/null
# - anonym: Don't log ips for CustomLog, send ErrorLog to /dev/null
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::passenger(
$ensure = present,
$uid = 'absent',
......@@ -30,6 +36,7 @@ define webhosting::passenger(
$password_crypted = true,
$domainalias = 'www',
$server_admin = 'absent',
$logmode = 'default',
$owner = root,
$group = 'absent',
$run_mode = 'normal',
......@@ -102,6 +109,7 @@ define webhosting::passenger(
ensure => $ensure,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
group => $real_group,
allow_override => $allow_override,
do_includes => $do_includes,
......
......@@ -26,6 +26,12 @@
# php_default_charset: default charset header for php.
# *default*: absent, which will set the same as default_charset
# of apache
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
# - nologs: Send every logging to /dev/null
# - anonym: Don't log ips for CustomLog, send ErrorLog to /dev/null
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php(
$ensure = present,
$uid = 'absent',
......@@ -40,6 +46,7 @@ define webhosting::php(
$password_crypted = true,
$domainalias = 'www',
$server_admin = 'absent',
$logmode = 'default',
$owner = root,
$group = 'absent',
$run_mode = 'normal',
......@@ -117,6 +124,7 @@ define webhosting::php(
ensure => $ensure,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
group => $real_group,
allow_override => $allow_override,
do_includes => $do_includes,
......
......@@ -17,6 +17,12 @@
# php_default_charset: default charset header for php.
# *default*: absent, which will set the same as default_charset
# of apache
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
# - nologs: Send every logging to /dev/null
# - anonym: Don't log ips for CustomLog, send ErrorLog to /dev/null
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php::drupal(
$ensure = present,
$uid = 'absent',
......@@ -28,6 +34,7 @@ define webhosting::php::drupal(
$password_crypted = true,
$domainalias = 'www',
$server_admin = 'absent',
$logmode = 'default',
$owner = root,
$group = 'sftponly',
$run_mode = 'normal',
......@@ -99,6 +106,7 @@ define webhosting::php::drupal(
ensure => $ensure,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
group => $group,
allow_override => $allow_override,
do_includes => $do_includes,
......
......@@ -17,6 +17,12 @@
# php_default_charset: default charset header for php.
# *default*: absent, which will set the same as default_charset
# of apache
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
# - nologs: Send every logging to /dev/null
# - anonym: Don't log ips for CustomLog, send ErrorLog to /dev/null
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php::gallery2(
$ensure = present,
$uid = 'absent',
......@@ -28,6 +34,7 @@ define webhosting::php::gallery2(
$password_crypted = true,
$domainalias = 'www',
$server_admin = 'absent',
$logmode = 'default',
$owner = root,
$group = 'sftponly',
$run_mode = 'normal',
......@@ -103,6 +110,7 @@ define webhosting::php::gallery2(
ensure => $ensure,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
group => $group,
allow_override => $allow_override,
do_includes => $do_includes,
......
......@@ -17,6 +17,12 @@
# php_default_charset: default charset header for php.
# *default*: absent, which will set the same as default_charset
# of apache
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
# - nologs: Send every logging to /dev/null
# - anonym: Don't log ips for CustomLog, send ErrorLog to /dev/null
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php::joomla(
$ensure = present,
$uid = 'absent',
......@@ -28,6 +34,7 @@ define webhosting::php::joomla(
$password_crypted = true,
$domainalias = 'www',
$server_admin = 'absent',
$logmode = 'default',
$owner = root,
$group = 'sftponly',
$run_mode = 'normal',
......@@ -98,6 +105,7 @@ define webhosting::php::joomla(
ensure => $ensure,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
group => $group,
allow_override => $allow_override,
do_includes => $do_includes,
......
......@@ -17,6 +17,12 @@
# php_default_charset: default charset header for php.
# *default*: absent, which will set the same as default_charset
# of apache
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
# - nologs: Send every logging to /dev/null
# - anonym: Don't log ips for CustomLog, send ErrorLog to /dev/null
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php::mediawiki(
$ensure = present,
$uid = 'absent',
......@@ -28,6 +34,7 @@ define webhosting::php::mediawiki(
$password_crypted = true,
$domainalias = 'www',
$server_admin = 'absent',
$logmode = 'default',
$owner = root,
$group = 'sftponly',
$run_mode = 'normal',
......@@ -100,6 +107,7 @@ define webhosting::php::mediawiki(
ensure => $ensure,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
group => $group,
manage_docroot => false,
allow_override => $allow_override,
......
......@@ -17,6 +17,12 @@
# php_default_charset: default charset header for php.
# *default*: absent, which will set the same as default_charset
# of apache
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
# - nologs: Send every logging to /dev/null
# - anonym: Don't log ips for CustomLog, send ErrorLog to /dev/null
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php::silverstripe(
$ensure = present,
$uid = 'absent',
......@@ -28,6 +34,7 @@ define webhosting::php::silverstripe(
$password_crypted = true,
$domainalias = 'www',
$server_admin = 'absent',
$logmode = 'default',
$owner = root,
$group = 'sftponly',
$run_mode = 'normal',
......@@ -98,6 +105,7 @@ define webhosting::php::silverstripe(
ensure => $ensure,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
group => $group,
allow_override => $allow_override,
do_includes => $do_includes,
......
......@@ -17,6 +17,12 @@
# php_default_charset: default charset header for php.
# *default*: absent, which will set the same as default_charset
# of apache
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
# - nologs: Send every logging to /dev/null
# - anonym: Don't log ips for CustomLog, send ErrorLog to /dev/null
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php::simplemachine(
$ensure = present,
$uid = 'absent',
......@@ -28,6 +34,7 @@ define webhosting::php::simplemachine(
$password_crypted = true,
$domainalias = 'www',
$server_admin = 'absent',
$logmode = 'default',
$owner = root,
$group = 'sftponly',
$run_mode = 'normal',
......@@ -98,6 +105,7 @@ define webhosting::php::simplemachine(
ensure => $ensure,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
group => $group,
allow_override => $allow_override,
do_includes => $do_includes,
......
......@@ -17,6 +17,12 @@
# php_default_charset: default charset header for php.
# *default*: absent, which will set the same as default_charset
# of apache
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
# - nologs: Send every logging to /dev/null
# - anonym: Don't log ips for CustomLog, send ErrorLog to /dev/null
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php::spip(
$ensure = present,
$uid = 'absent',
......@@ -28,6 +34,7 @@ define webhosting::php::spip(
$password_crypted = true,
$domainalias = 'www',
$server_admin = 'absent',
$logmode = 'default',
$owner = root,
$group = 'sftponly',
$run_mode = 'normal',
......@@ -94,6 +101,7 @@ define webhosting::php::spip(
ensure => $ensure,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
group => $group,
allow_override => $allow_override,
do_includes => $do_includes,
......
......@@ -17,6 +17,12 @@
# php_default_charset: default charset header for php.
# *default*: absent, which will set the same as default_charset
# of apache
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
# - nologs: Send every logging to /dev/null
# - anonym: Don't log ips for CustomLog, send ErrorLog to /dev/null
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php::typo3(
$ensure = present,
$uid = 'absent',
......@@ -28,6 +34,7 @@ define webhosting::php::typo3(
$password_crypted = true,
$domainalias = 'www',
$server_admin = 'absent',
$logmode = 'default',
$owner = root,
$group = 'sftponly',
$run_mode = 'normal',
......@@ -98,6 +105,7 @@ define webhosting::php::typo3(
ensure => $ensure,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
group => $group,
allow_override => $allow_override,
do_includes => $do_includes,
......
......@@ -17,6 +17,12 @@
# php_default_charset: default charset header for php.
# *default*: absent, which will set the same as default_charset
# of apache
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
# - nologs: Send every logging to /dev/null
# - anonym: Don't log ips for CustomLog, send ErrorLog to /dev/null
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php::wordpress(
$ensure = present,
$uid = 'absent',
......@@ -28,6 +34,7 @@ define webhosting::php::wordpress(
$password_crypted = true,
$domainalias = 'www',
$server_admin = 'absent',
$logmode = 'default',
$owner = root,
$group = 'sftponly',
$run_mode = 'normal',
......@@ -100,6 +107,7 @@ define webhosting::php::wordpress(
ensure => $ensure,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
group => $group,
allow_override => $allow_override,
do_includes => $do_includes,
......
......@@ -5,6 +5,12 @@
# user_provider:
# - local: user will be crated locally (*default*)
# - everything else will currently do noting
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
# - nologs: Send every logging to /dev/null
# - anonym: Don't log ips for CustomLog, send ErrorLog to /dev/null
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::static(
$ensure = present,
$uid = 'absent',
......@@ -16,6 +22,7 @@ define webhosting::static(
$password_crypted = true,
$domainalias = 'www',
$server_admin = 'absent',
$logmode = 'default',
$owner = root,
$group = 'sftponly',
$allow_override = 'None',
......@@ -63,7 +70,8 @@ define webhosting::static(
apache::vhost::static{"${name}":
ensure => $ensure,
domainalias => $domainalias,
server_admin => 'absent',
server_admin => $server_admin,
logmode => $logmode,
group => $group,
documentroot_owner => $real_uid_name,
documentroot_group => $group,
......
Supports Markdown
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