Skip to content

Enhancements #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Enhancements #9

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7966b99
Replace class dependencies with ensure_resource
dspinellis Dec 3, 2014
2dce897
Remove dependency to legacy mysql::config
dspinellis Dec 4, 2014
6d52023
Update MediaWiki download URL to current version
dspinellis Dec 4, 2014
94e84ff
Allow wikis to be defined by virtual host name
dspinellis Dec 4, 2014
f762a3e
Wiki admin name and password configuration options
dspinellis Dec 4, 2014
ecc94ce
Add language configuration
dspinellis Dec 18, 2014
550c414
Allow configuring images directory with a link
dspinellis Dec 18, 2014
9a68ceb
Update for 1.26.2
dspinellis Feb 2, 2016
491103d
Expose used versions
dspinellis Feb 2, 2016
9a6e5c4
Add SSL support
dspinellis Feb 20, 2017
98c48cb
Merge dds changes on top of NexusIS ones
dspinellis Oct 12, 2017
ebf079f
Update to version 1.29.1
dspinellis Oct 12, 2017
38714d8
Merge branch 'master' into merge-dds
dspinellis Oct 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Allow configuring images directory with a link
  • Loading branch information
@dspinellis
dspinellis committed Dec 18, 2014
commit 550c41498ec470cffec364f634e8c20e88e8d4ae
21 changes: 16 additions & 5 deletions manifests/instance.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
$admin_name = 'admin',
$admin_password = 'puppet',
$language = 'en',
$images_dir = '',
) {

validate_re($ensure, '^(present|absent|deleted)$',
Expand Down Expand Up @@ -129,15 +130,25 @@
}

# Each instance needs a separate folder to upload images
file { "${mediawiki_conf_dir}/${name}/images":
ensure => directory,
group => $::operatingsystem ? {
$images_group = $::operatingsystem ? {
/(?i)(redhat|centos)/ => 'apache',
/(?i)(debian|ubuntu)/ => 'www-data',
default => undef,
}
}


if $images_dir == '' {
file { "${mediawiki_conf_dir}/${name}/images":
ensure => directory,
group => $images_group
}
} else {
file { "${mediawiki_conf_dir}/${name}/images":
ensure => link,
target => $images_dir,
group => $images_group
}
}

# Ensure that mediawiki configuration files are included in each instance.
mediawiki::symlinks { $name:
conf_dir => $mediawiki_conf_dir,
Expand Down