Commit 649dee14 authored by andreas@immerda.ch's avatar andreas@immerda.ch
Browse files

add gid_name to all the sub functions, use it where appropriate

parent dbb1e371
......@@ -16,6 +16,7 @@ define webhosting::common(
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
$gid_name = 'absent',
$user_provider = 'local',
$user_access = 'sftp',
$webdav_domain = 'absent',
......@@ -49,11 +50,22 @@ define webhosting::common(
} else {
$real_uid_name = $uid_name
}
if ($gid_name == 'absent'){
$real_gid_name = $real_uid_name
} else {
$real_gid_name = $gid_name
}
if ($run_uid_name == 'absent'){
$real_run_uid_name = "${name}_run"
} else {
$real_run_uid_name = $run_uid_name
}
# not yet used below
# if ($run_gid_name == 'absent'){
# $real_run_gid_name = $real_run_uid_name
# } else {
# $real_run_gid_name = $run_gid_name
# }
if ($user_provider == 'local') and ($user_access == 'sftp') {
user::sftp_only{"${real_uid_name}":
ensure => $ensure,
......
......@@ -16,6 +16,7 @@ define webhosting::modperl(
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
$gid_name = 'absent',
$user_provider = 'local',
$password = 'absent',
$password_crypted = true,
......@@ -49,11 +50,17 @@ define webhosting::modperl(
} else {
$real_uid_name = $uid_name
}
if ($gid_name == 'absent'){
$real_gid_name = $real_uid_name
} else {
$real_gid_name = $gid_name
}
webhosting::common{$name:
ensure => $ensure,
uid => $uid,
uid_name => $uid_name,
uid_name => $real_uid_name,
gid => $gid,
gid_name => $real_gid_name,
user_provider => $user_provider,
password => $password,
password_crypted => $password_crypted,
......@@ -102,7 +109,7 @@ define webhosting::modperl(
Apache::Vhost::Modperl[$name]{
documentroot_owner => $real_uid_name,
documentroot_group => $real_uid_name,
documentroot_group => $real_gid_name,
documentroot_mode => 0750,
run_uid => $real_run_uid_name,
run_gid => $real_run_gid_name,
......
......@@ -21,6 +21,7 @@ define webhosting::passenger(
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
$gid_name = 'absent',
$user_provider = 'local',
$user_access = 'sftp',
$webdav_domain = 'absent',
......@@ -63,17 +64,22 @@ define webhosting::passenger(
$real_group = $group
}
}
if ($uid_name == 'absent'){
$real_uid_name = $name
} else {
$real_uid_name = $uid_name
}
if ($gid_name == 'absent'){
$real_gid_name = $real_uid_name
} else {
$real_gid_name = $gid_name
}
webhosting::common{$name:
ensure => $ensure,
uid => $uid,
uid_name => $uid_name,
uid_name => $real_uid_name,
gid => $gid,
gid_name => $real_gid_name,
user_provider => $user_provider,
user_access => $user_access,
webdav_domain => $webdav_domain,
......@@ -127,7 +133,7 @@ define webhosting::passenger(
}
Apache::Vhost::Passenger[$name]{
documentroot_owner => $real_uid_name,
documentroot_group => $real_uid_name,
documentroot_group => $real_gid_name,
documentroot_mode => 0750,
run_uid => $real_run_uid_name,
run_gid => $real_run_gid_name,
......
......@@ -31,6 +31,7 @@ define webhosting::php(
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
$gid_name = 'absent',
$user_provider = 'local',
$user_access = 'sftp',
$webdav_domain = 'absent',
......@@ -83,12 +84,17 @@ define webhosting::php(
} else {
$real_uid_name = $uid_name
}
if ($gid_name == 'absent'){
$real_gid_name = $real_uid_name
} else {
$real_gid_name = $gid_name
}
webhosting::common{$name:
ensure => $ensure,
uid => $uid,
uid_name => $uid_name,
uid_name => $real_uid_name,
gid => $gid,
gid_name => $real_gid_name,
user_provider => $user_provider,
user_access => $user_access,
webdav_domain => $webdav_domain,
......@@ -145,7 +151,7 @@ define webhosting::php(
}
Apache::Vhost::Php::Standard[$name]{
documentroot_owner => $real_uid_name,
documentroot_group => $real_uid_name,
documentroot_group => $real_gid_name,
documentroot_mode => 0750,
run_uid => $real_run_uid_name,
run_gid => $real_run_gid_name,
......
......@@ -73,6 +73,7 @@ define webhosting::php::drupal(
uid => $uid,
uid_name => $real_uid_name,
gid => $gid,
gid_name => $real_gid_name,
user_provider => $user_provider,
password => $password,
password_crypted => $password_crypted,
......@@ -156,7 +157,7 @@ define webhosting::php::drupal(
}
Apache::Vhost::Php::Drupal[$name]{
documentroot_owner => $real_uid_name,
documentroot_group => $real_uid_name,
documentroot_group => $real_gid_name,
run_uid => $real_run_uid_name,
run_gid => $real_run_gid_name,
require => [ User::Sftp_only["${real_uid_name}"], User::Managed["${real_run_uid_name}"] ],
......
......@@ -22,6 +22,7 @@ define webhosting::php::gallery2(
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
$gid_name = 'absent',
$user_provider = 'local',
$password = 'absent',
$password_crypted = true,
......@@ -61,11 +62,17 @@ define webhosting::php::gallery2(
} else {
$real_uid_name = $uid_name
}
if ($gid_name == 'absent'){
$real_gid_name = $real_uid_name
} else {
$real_gid_name = $gid_name
}
webhosting::common{$name:
ensure => $ensure,
uid => $uid,
uid_name => $uid_name,
uid_name => $real_uid_name,
gid => $gid,
gid_name => $real_gid_name,
user_provider => $user_provider,
password => $password,
password_crypted => $password_crypted,
......@@ -151,7 +158,7 @@ define webhosting::php::gallery2(
}
Apache::Vhost::Php::Gallery2[$name]{
documentroot_owner => $real_uid_name,
documentroot_group => $real_uid_name,
documentroot_group => $real_gid_name,
run_uid => $real_run_uid_name,
run_gid => $real_run_gid_name,
require => [ User::Sftp_only["${real_uid_name}"], User::Managed["${real_run_uid_name}"] ],
......
......@@ -22,6 +22,7 @@ define webhosting::php::joomla(
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
$gid_name = 'absent',
$user_provider = 'local',
$password = 'absent',
$password_crypted = true,
......@@ -61,11 +62,17 @@ define webhosting::php::joomla(
} else {
$real_uid_name = $uid_name
}
if ($gid_name == 'absent'){
$real_gid_name = $real_uid_name
} else {
$real_gid_name = $gid_name
}
webhosting::common{$name:
ensure => $ensure,
uid => $uid,
uid_name => $uid_name,
uid_name => $real_uid_name,
gid => $gid,
gid_name => $real_gid_name,
user_provider => $user_provider,
password => $password,
password_crypted => $password_crypted,
......@@ -119,7 +126,7 @@ define webhosting::php::joomla(
git_repo => $git_repo,
projectroot => $documentroot,
cloneddir_user => $real_uid_name,
cloneddir_group => $real_uid_name,
cloneddir_group => $real_gid_name,
before => Apache::Vhost::Php::Joomla[$name],
}
apache::vhost::file::documentrootdir{"joomlagitdir_${name}":
......@@ -146,7 +153,7 @@ define webhosting::php::joomla(
}
Apache::Vhost::Php::Joomla[$name]{
documentroot_owner => $real_uid_name,
documentroot_group => $real_uid_name,
documentroot_group => $real_gid_name,
run_uid => $real_run_uid_name,
run_gid => $real_run_gid_name,
require => [ User::Sftp_only["${real_uid_name}"], User::Managed["${real_run_uid_name}"] ],
......
......@@ -22,6 +22,7 @@ define webhosting::php::mediawiki(
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
$gid_name = 'absent',
$user_provider = 'local',
$password = 'absent',
$password_crypted = true,
......@@ -69,11 +70,17 @@ define webhosting::php::mediawiki(
} else {
$real_uid_name = $uid_name
}
if ($gid_name == 'absent'){
$real_gid_name = $real_uid_name
} else {
$real_gid_name = $gid_name
}
webhosting::common{$name:
ensure => $ensure,
uid => $uid,
uid_name => $uid_name,
uid_name => $real_uid_name,
gid => $gid,
gid_name => $real_gid_name,
user_provider => $user_provider,
password => $password,
password_crypted => $password_crypted,
......@@ -141,14 +148,14 @@ define webhosting::php::mediawiki(
}
Apache::Vhost::Php::Mediawiki[$name]{
documentroot_owner => $real_uid_name,
documentroot_group => $real_uid_name,
documentroot_group => $real_gid_name,
run_uid => $real_run_uid_name,
run_gid => $real_run_gid_name,
require => [ User::Sftp_only["${real_uid_name}"], User::Managed["${real_run_uid_name}"] ],
}
Mediawiki::Instance[$name]{
documentroot_owner => $real_uid_name,
documentroot_group => $real_uid_name,
documentroot_group => $real_gid_name,
documentroot_mode => 0640,
require => [ User::Sftp_only["${real_uid_name}"], User::Managed["${real_run_uid_name}"] ],
}
......
......@@ -22,6 +22,7 @@ define webhosting::php::silverstripe(
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
$gid_name = 'absent',
$user_provider = 'local',
$password = 'absent',
$password_crypted = true,
......@@ -61,11 +62,17 @@ define webhosting::php::silverstripe(
} else {
$real_uid_name = $uid_name
}
if ($gid_name == 'absent'){
$real_gid_name = $real_uid_name
} else {
$real_gid_name = $gid_name
}
webhosting::common{$name:
ensure => $ensure,
uid => $uid,
uid_name => $uid_name,
uid_name => $real_uid_name,
gid => $gid,
gid_name => $real_gid_name,
user_provider => $user_provider,
password => $password,
password_crypted => $password_crypted,
......@@ -119,7 +126,7 @@ define webhosting::php::silverstripe(
git_repo => $git_repo,
projectroot => $documentroot,
cloneddir_user => $real_uid_name,
cloneddir_group => $real_uid_name,
cloneddir_group => $real_gid_name,
before => Apache::Vhost::Php::Silverstripe[$name],
}
apache::vhost::file::documentrootdir{"silverstripegitdir_${name}":
......@@ -146,7 +153,7 @@ define webhosting::php::silverstripe(
}
Apache::Vhost::Php::Silverstripe[$name]{
documentroot_owner => $real_uid_name,
documentroot_group => $real_uid_name,
documentroot_group => $real_gid_name,
run_uid => $real_run_uid_name,
run_gid => $real_run_gid_name,
require => [ User::Sftp_only["${real_uid_name}"], User::Managed["${real_run_uid_name}"] ],
......
......@@ -22,6 +22,7 @@ define webhosting::php::simplemachine(
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
$gid_name = 'absent',
$user_provider = 'local',
$password = 'absent',
$password_crypted = true,
......@@ -61,11 +62,17 @@ define webhosting::php::simplemachine(
} else {
$real_uid_name = $uid_name
}
if ($gid_name == 'absent'){
$real_gid_name = $real_uid_name
} else {
$real_gid_name = $gid_name
}
webhosting::common{$name:
ensure => $ensure,
uid => $uid,
uid_name => $uid_name,
uid_name => $real_uid_name,
gid => $gid,
gid_name => $real_gid_name,
user_provider => $user_provider,
password => $password,
password_crypted => $password_crypted,
......@@ -119,7 +126,7 @@ define webhosting::php::simplemachine(
git_repo => $git_repo,
projectroot => $documentroot,
cloneddir_user => $real_uid_name,
cloneddir_group => $real_uid_name,
cloneddir_group => $real_gid_name,
before => Apache::Vhost::Php::Simplemachine[$name],
}
apache::vhost::file::documentrootdir{"simplemachinesgitdir_${name}":
......@@ -145,7 +152,7 @@ define webhosting::php::simplemachine(
}
Apache::Vhost::Php::Simplemachine[$name]{
documentroot_owner => $real_uid_name,
documentroot_group => $real_uid_name,
documentroot_group => $real_gid_name,
run_uid => $real_run_uid_name,
run_gid => $real_run_gid_name,
require => [ User::Sftp_only["${real_uid_name}"], User::Managed["${real_run_uid_name}"] ],
......
......@@ -22,6 +22,7 @@ define webhosting::php::spip(
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
$gid_name = 'absent',
$user_provider = 'local',
$password = 'absent',
$password_crypted = true,
......@@ -57,11 +58,17 @@ define webhosting::php::spip(
} else {
$real_uid_name = $uid_name
}
if ($gid_name == 'absent'){
$real_gid_name = $real_uid_name
} else {
$real_gid_name = $gid_name
}
webhosting::common{$name:
ensure => $ensure,
uid => $uid,
uid_name => $uid_name,
uid_name => $real_uid_name,
gid => $gid,
gid_name => $real_gid_name,
user_provider => $user_provider,
password => $password,
password_crypted => $password_crypted,
......@@ -118,7 +125,7 @@ define webhosting::php::spip(
}
Apache::Vhost::Php::Spip[$name]{
documentroot_owner => $real_uid_name,
documentroot_group => $real_uid_name,
documentroot_group => $real_gid_name,
run_uid => $real_run_uid_name,
run_gid => $real_run_gid_name,
require => [ User::Sftp_only["${real_uid_name}"], User::Managed["${real_run_uid_name}"] ],
......
......@@ -22,6 +22,7 @@ define webhosting::php::typo3(
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
$gid_name = 'absent',
$user_provider = 'local',
$password = 'absent',
$password_crypted = true,
......@@ -61,11 +62,17 @@ define webhosting::php::typo3(
} else {
$real_uid_name = $uid_name
}
if ($gid_name == 'absent'){
$real_gid_name = $real_uid_name
} else {
$real_gid_name = $gid_name
}
webhosting::common{$name:
ensure => $ensure,
uid => $uid,
uid_name => $uid_name,
uid_name => $real_uid_name,
gid => $gid,
gid_name => $real_gid_name,
user_provider => $user_provider,
password => $password,
password_crypted => $password_crypted,
......@@ -119,7 +126,7 @@ define webhosting::php::typo3(
git_repo => $git_repo,
projectroot => $documentroot,
cloneddir_user => $real_uid_name,
cloneddir_group => $real_uid_name,
cloneddir_group => $real_gid_name,
before => Apache::Vhost::Php::Typo3[$name],
}
apache::vhost::file::documentrootdir{"typo3gitdir_${name}":
......@@ -146,7 +153,7 @@ define webhosting::php::typo3(
}
Apache::Vhost::Php::Typo3[$name]{
documentroot_owner => $real_uid_name,
documentroot_group => $real_uid_name,
documentroot_group => $real_gid_name,
run_uid => $real_run_uid_name,
run_gid => $real_run_gid_name,
require => [ User::Sftp_only["${real_uid_name}"], User::Managed["${real_run_uid_name}"] ],
......
......@@ -22,6 +22,7 @@ define webhosting::php::wordpress(
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
$gid_name = 'absent',
$user_provider = 'local',
$password = 'absent',
$password_crypted = true,
......@@ -63,11 +64,17 @@ define webhosting::php::wordpress(
} else {
$real_uid_name = $uid_name
}
if ($gid_name == 'absent'){
$real_gid_name = $real_uid_name
} else {
$real_gid_name = $gid_name
}
webhosting::common{$name:
ensure => $ensure,
uid => $uid,
uid_name => $uid_name,
uid_name => $real_uid_name,
gid => $gid,
gid_name => $real_gid_name,
user_provider => $user_provider,
password => $password,
password_crypted => $password_crypted,
......@@ -120,8 +127,8 @@ define webhosting::php::wordpress(
ensure => $ensure,
git_repo => $git_repo,
projectroot => $documentroot,
cloneddir_user => $name,
cloneddir_group => $name,
cloneddir_user => $real_uid_name,
cloneddir_group => $real_gid_name,
before => Apache::Vhost::Php::Wordpress[$name],
}
apache::vhost::file::documentrootdir{"wordpressgitdir_${name}":
......@@ -147,7 +154,7 @@ define webhosting::php::wordpress(
}
Apache::Vhost::Php::Wordpress[$name]{
documentroot_owner => $real_uid_name,
documentroot_group => $real_uid_name,
documentroot_group => $real_gid_name,
run_uid => $real_run_uid_name,
run_gid => $real_run_gid_name,
require => [ User::Sftp_only["${name}"], User::Managed["${real_run_uid_name}"] ],
......
......@@ -10,6 +10,7 @@ define webhosting::static(
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
$gid_name = 'absent',
$user_provider = 'local',
$password = 'absent',
$password_crypted = true,
......@@ -38,11 +39,17 @@ define webhosting::static(
} else {
$real_uid_name = $uid_name
}
if ($gid_name == 'absent'){
$real_gid_name = $real_uid_name
} else {
$real_gid_name = $gid_name
}
webhosting::common{$name:
ensure => $ensure,
uid => $uid,
uid_name => $uid_name,
uid_name => $real_uid_name,
gid => $gid,
gid_name => $real_gid_name,
user_provider => $user_provider,
password => $password,
password_crypted => $password_crypted,
......
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