Compare commits
No commits in common. "de5378be340538a928ae560546f9eb88574ccdb7" and "99c9f2a8c04a2597b5967f251199e9f3f0edf465" have entirely different histories.
de5378be34
...
99c9f2a8c0
|
@ -3,28 +3,12 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
class wmdeit_ldap::lam(
|
class wmdeit_ldap::lam(
|
||||||
$archive = "lam_7_2.tar.gz",
|
$archive = "lam_7_2.tar.gz"
|
||||||
$domain = 'default1',
|
|
||||||
$logdestination = "SYSLOG",
|
|
||||||
$lamloglevel = 4,
|
|
||||||
$master_password = "lam",
|
|
||||||
$master_password_salt = "ABCD1234",
|
|
||||||
|
|
||||||
) {
|
) {
|
||||||
$arcfile = "/tmp/$archive"
|
$arcfile = "/tmp/$archive"
|
||||||
$extractdir = "/var/www/ldapaccountmanager"
|
|
||||||
$docroot = "$extractdir/lam"
|
|
||||||
|
|
||||||
$encoded_master_password= strip (regsubst(
|
|
||||||
generate ("/bin/sh", "-c", "echo -n $master_password$master_password_salt | openssl dgst -binary -sha1 | openssl base64")
|
|
||||||
, '\n', "\n "))
|
|
||||||
|
|
||||||
$encoded_master_password_salt = strip(regsubst(
|
|
||||||
generate("/bin/sh","-c", "echo -n $master_password_salt | openssl base64")
|
|
||||||
, '\n', "\n "))
|
|
||||||
|
|
||||||
class { 'apache':
|
class { 'apache':
|
||||||
default_vhost => false,
|
|
||||||
mpm_module => 'prefork',
|
mpm_module => 'prefork',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,10 +19,6 @@ class wmdeit_ldap::lam(
|
||||||
class { '::php':
|
class { '::php':
|
||||||
extensions => {
|
extensions => {
|
||||||
curl => {},
|
curl => {},
|
||||||
ldap => {},
|
|
||||||
gd => {},
|
|
||||||
gmp => {},
|
|
||||||
zip => {},
|
|
||||||
},
|
},
|
||||||
notify => Service["apache2"],
|
notify => Service["apache2"],
|
||||||
require => Class["apache"]
|
require => Class["apache"]
|
||||||
|
@ -52,21 +32,7 @@ class wmdeit_ldap::lam(
|
||||||
source => "https://srcsrv.wikimedia.de/WMDE/LDAPAccountManager/archive/$archive",
|
source => "https://srcsrv.wikimedia.de/WMDE/LDAPAccountManager/archive/$archive",
|
||||||
extract => true,
|
extract => true,
|
||||||
extract_path => "/var/www",
|
extract_path => "/var/www",
|
||||||
creates => $extractdir
|
creates => "/var/www/ldapaccountmanager",
|
||||||
} ->
|
|
||||||
apache::vhost { $domain:
|
|
||||||
port => '80',
|
|
||||||
docroot => $docroot
|
|
||||||
} ->
|
|
||||||
file {["$docroot/tmp","$docroot/sess"]:
|
|
||||||
ensure => directory,
|
|
||||||
owner => "www-data"
|
|
||||||
} ->
|
|
||||||
file {"$docroot/config/config.cfg":
|
|
||||||
ensure => file,
|
|
||||||
content => template("wmdeit_ldap/lam-config.cfg.erb"),
|
|
||||||
owner => "www-data",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
|
|
||||||
# password to add/delete/rename configuration profiles (default: lam)
|
|
||||||
password: {SSHA}<%= @encoded_master_password %> <%= @encoded_master_password_salt %>
|
|
||||||
|
|
||||||
# default profile, without ".conf"
|
|
||||||
default: lam
|
|
||||||
|
|
||||||
# log level
|
|
||||||
logLevel: 4
|
|
||||||
|
|
||||||
# log destination
|
|
||||||
logDestination: <%= @logdestination %>
|
|
Loading…
Reference in New Issue