Commit 1013d06b authored by mh's avatar mh
Browse files

user should only be there if we add things

parent dc15f3f1
......@@ -138,14 +138,18 @@ define webhosting::modperl(
run_uid => $real_run_uid_name,
run_gid => $real_run_gid_name,
}
Apache::Vhost::Modperl[$name]{
require => [ User::Sftp_only[$real_uid_name],
User::Managed[$real_run_uid_name] ],
if $ensure != 'absent' {
Apache::Vhost::Modperl[$name]{
require => [ User::Sftp_only[$real_uid_name],
User::Managed[$real_run_uid_name] ],
}
}
}
default: {
Apache::Vhost::Modperl[$name]{
require => User::Sftp_only[$real_uid_name],
if $ensure != 'absent' {
Apache::Vhost::Modperl[$name]{
require => User::Sftp_only[$real_uid_name],
}
}
}
}
......
......@@ -166,9 +166,11 @@ define webhosting::passenger(
run_uid => $real_run_uid_name,
run_gid => $real_run_gid_name,
}
Apache::Vhost::Passenger[$name]{
require => [ User::Sftp_only[$real_uid_name],
User::Managed[$real_run_uid_name] ],
if $ensure != 'absent' {
Apache::Vhost::Passenger[$name]{
require => [ User::Sftp_only[$real_uid_name],
User::Managed[$real_run_uid_name] ],
}
}
}
default: {
......
......@@ -153,14 +153,18 @@ define webhosting::php(
run_uid => $real_run_uid_name,
run_gid => $real_run_gid_name,
}
Apache::Vhost::Php::Standard[$name]{
require => [User::Sftp_only[$real_uid_name],
User::Managed[$real_run_uid_name] ],
if $ensure != 'absent' {
Apache::Vhost::Php::Standard[$name]{
require => [User::Sftp_only[$real_uid_name],
User::Managed[$real_run_uid_name] ],
}
}
}
default: {
Apache::Vhost::Php::Standard[$name]{
require => User::Sftp_only[$real_uid_name],
if $ensure != 'absent' {
Apache::Vhost::Php::Standard[$name]{
require => User::Sftp_only[$real_uid_name],
}
}
}
}
......
......@@ -156,13 +156,19 @@ define webhosting::php::drupal(
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] ],
}
if $ensure != 'absent' {
Apache::Vhost::Php::Drupal[$name]{
require => [User::Sftp_only[$real_uid_name],
User::Managed[$real_run_uid_name] ],
}
}
}
default: {
Apache::Vhost::Php::Drupal[$name]{
require => User::Sftp_only[$real_uid_name],
if $ensure != 'absent' {
Apache::Vhost::Php::Drupal[$name]{
require => User::Sftp_only[$real_uid_name],
}
}
}
}
......
......@@ -154,13 +154,19 @@ define webhosting::php::joomla(
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] ],
}
if $ensure != 'absent' {
Apache::Vhost::Php::Joomla[$name]{
require => [User::Sftp_only[$real_uid_name],
User::Managed[$real_run_uid_name] ],
}
}
}
default: {
Apache::Vhost::Php::Joomla[$name]{
require => User::Sftp_only[$real_uid_name],
if $ensure != 'absent' {
Apache::Vhost::Php::Joomla[$name]{
require => User::Sftp_only[$real_uid_name],
}
}
}
}
......
......@@ -190,23 +190,31 @@ define webhosting::php::mediawiki(
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_gid_name,
documentroot_mode => '0640',
require => [ User::Sftp_only[$real_uid_name],
User::Managed[$real_run_uid_name] ],
}
if $ensure != 'absent' {
Apache::Vhost::Php::Mediawiki[$name]{
require => [User::Sftp_only[$real_uid_name],
User::Managed[$real_run_uid_name] ],
}
Mediawiki::Instance[$name]{
require => [User::Sftp_only[$real_uid_name],
User::Managed[$real_run_uid_name] ],
}
}
}
default: {
Apache::Vhost::Php::Mediawiki[$name]{
require => User::Sftp_only[$real_uid_name],
}
Mediawiki::Instance[$name]{
require => User::Sftp_only[$real_uid_name],
if $ensure != 'absent' {
Apache::Vhost::Php::Mediawiki[$name]{
require => User::Sftp_only[$real_uid_name],
}
Mediawiki::Instance[$name]{
require => User::Sftp_only[$real_uid_name],
}
}
}
}
......
......@@ -153,13 +153,19 @@ define webhosting::php::silverstripe(
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] ],
}
if $ensure != 'absent' {
Apache::Vhost::Php::Silverstripe[$name]{
require => [User::Sftp_only[$real_uid_name],
User::Managed[$real_run_uid_name] ],
}
}
}
default: {
Apache::Vhost::Php::Silverstripe[$name]{
require => User::Sftp_only[$real_uid_name],
if $ensure != 'absent' {
Apache::Vhost::Php::Silverstripe[$name]{
require => User::Sftp_only[$real_uid_name],
}
}
}
}
......
......@@ -135,7 +135,7 @@ define webhosting::php::simplemachine(
}
if ($git_repo != 'absent') and ($ensure != 'absent') {
# include an update script if we deploy it the git way
include ::webhosting::php::simplemachine::base
include webhosting::php::simplemachine::base
}
case $run_mode {
'fpm','fcgid': {
......@@ -157,13 +157,19 @@ define webhosting::php::simplemachine(
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] ],
}
if $ensure != 'absent' {
Apache::Vhost::Php::Simplemachine[$name]{
require => [User::Sftp_only[$real_uid_name],
User::Managed[$real_run_uid_name] ],
}
}
}
default: {
Apache::Vhost::Php::Simplemachine[$name]{
require => User::Sftp_only[$real_uid_name],
if $ensure != 'absent' {
Apache::Vhost::Php::Simplemachine[$name]{
require => User::Sftp_only[$real_uid_name],
}
}
}
}
......
......@@ -147,13 +147,19 @@ define webhosting::php::spip(
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] ],
}
if $ensure != 'absent' {
Apache::Vhost::Php::Spip[$name]{
require => [User::Sftp_only[$real_uid_name],
User::Managed[$real_run_uid_name] ],
}
}
}
default: {
Apache::Vhost::Php::Spip[$name]{
require => User::Sftp_only[$real_uid_name],
if $ensure != 'absent' {
Apache::Vhost::Php::Spip[$name]{
require => User::Sftp_only[$real_uid_name],
}
}
}
}
......
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