Permalink
Browse files

froxlor settings with settings resource, and possibility to use froxl…

…or for the root directory
  • Loading branch information...
1 parent 3b3e11d commit edea01d9ecfbb6208f77a1d9738f516e800256c5 @zauberpony committed Feb 27, 2014
Showing with 30 additions and 16 deletions.
  1. +18 −6 manifests/config.pp
  2. +11 −10 manifests/init.pp
  3. +1 −0 manifests/params.pp
View
@@ -44,13 +44,25 @@
->
class { "froxlor::smtp": }
- exec { 'documentroot_use_default_value':
- command => "/usr/bin/mysql -u froxlor -p${mysql_froxlor_password} froxlor -e \
- \"update panel_settings set value = 1 where settinggroup = 'system' and varname = 'documentroot_use_default_value'\""
+ froxlor::setting { 'documentroot':
+ group => 'system',
+ key => 'documentroot_use_default_value',
+ value => true
}
- exec { 'phpmyadmin_panel_link':
- command => "/usr/bin/mysql -u froxlor -p${mysql_froxlor_password} froxlor -e \
- \"update panel_settings set value = 'http://${servername}/phpmyadmin' where settinggroup = 'panel' and varname = 'phpmyadmin_url'\""
+
+ froxlor::setting { 'phpmyadmin_url':
+ group => 'panel',
+ key => 'phpmyadmin_url',
+ value => "http://${servername}/phpmyadmin",
+ }
+
+ froxlor::setting { 'froxlor_root_directory':
+ group => 'system',
+ key => 'froxlordirectlyviahostname',
+ value => $install_at_root,
}
+
+
+
}
View
@@ -36,16 +36,17 @@
# Copyright 2014 Your name here, unless otherwise noted.
#
class froxlor (
- $mysql_host = $froxlor::params::mysql_host,
- $mysql_root_password = $froxlor::params::mysql_root_password,
- $mysql_froxlor_password = $froxlor::params::mysql_froxlor_password,
- $admin_name = $froxlor::params::admin_name,
- $admin_password = $froxlor::params::admin_password,
- $serverip = $froxlor::params::serverip,
- $servername = $froxlor::params::servername,
- $http_user = $froxlor::params::http_user,
- $http_group = $froxlor::params::http_group,
- $phpmyadmin_mysql_password = $froxlor::params::phpmyadmin_mysql_password
+ $mysql_host = $froxlor::params::mysql_host,
+ $mysql_root_password = $froxlor::params::mysql_root_password,
+ $mysql_froxlor_password = $froxlor::params::mysql_froxlor_password,
+ $admin_name = $froxlor::params::admin_name,
+ $admin_password = $froxlor::params::admin_password,
+ $serverip = $froxlor::params::serverip,
+ $servername = $froxlor::params::servername,
+ $http_user = $froxlor::params::http_user,
+ $http_group = $froxlor::params::http_group,
+ $phpmyadmin_mysql_password = $froxlor::params::phpmyadmin_mysql_password,
+ $install_at_root = $froxlor::params::install_at_root
) inherits froxlor::params {
include 'apt'
View
@@ -9,4 +9,5 @@
$http_user = 'www-data'
$http_group = 'www-data'
$phpmyadmin_mysql_password = 'phpmyadminpassword'
+ $install_at_root = true
}

0 comments on commit edea01d

Please sign in to comment.