OP#410 fix basic errrors
This commit is contained in:
@@ -35,7 +35,6 @@ Installation
|
||||
|
||||
Configuration
|
||||
|
||||
* manage user settings (optional)
|
||||
* manage directory structure (optional)
|
||||
* manage configuration files (optional):
|
||||
* file system permissions
|
||||
@@ -106,6 +105,7 @@ All files and directories are configured with correct selinux context. If selinu
|
||||
## Contact Us
|
||||
|
||||
[contact Us](https://confdroid.com/contact/)
|
||||
[Feedback Portal](https://feedback.confdroid.com/)
|
||||
|
||||
## Disclaimer
|
||||
|
||||
|
||||
@@ -4,8 +4,7 @@
|
||||
# @summary This class holds all parameters for the confdroid_apache module, which are
|
||||
# inherited by all classes except defines.
|
||||
# @param [String] pkg_ensure Specify which
|
||||
# [package type] (https://confdroid.com/2017/05/puppet-type-package/)
|
||||
# to use, i.e. `latest`, `present` or `absent`.
|
||||
# package type to use, i.e. `latest`, `present` or `absent`.
|
||||
# @param [Boolean] ae_manage_user Whether or not to manage details for the
|
||||
# httpd service user. This is generally only required when using httpd on
|
||||
# a number of servers sharing storage resources, i.e. NFS, where UID and GID
|
||||
@@ -42,22 +41,13 @@
|
||||
# @param [String] ae_https_port the port to use for the https protocol
|
||||
# @param [String] ae_target_service which service to monitor with nagios
|
||||
# @param [Boolean] ae_manage_fw whether to manage firewall settings
|
||||
# @param [String] reqpackages List of packages to install.
|
||||
# @param [Array] reqpackages List of packages to install.
|
||||
###########################################################################
|
||||
class confdroid_apache::params (
|
||||
|
||||
# installation
|
||||
String $pkg_ensure = 'latest',
|
||||
String $reqpackages = ['httpd','mod_ssl'],
|
||||
|
||||
Boolean $ae_manage_user = false,
|
||||
|
||||
String $ae_user_name = 'apache',
|
||||
String $ae_user_uid = '48',
|
||||
String $ae_u_comment = 'Apache',
|
||||
String $ae_u_groups = undef,
|
||||
String $ae_user_home = '/usr/share/httpd',
|
||||
String $ae_user_shell = '/bin/false',
|
||||
String $pkg_ensure = 'present',
|
||||
Array $reqpackages = ['httpd','mod_ssl'],
|
||||
|
||||
# configuration files
|
||||
Boolean $ae_manage_cfg = false,
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
class confdroid_apache::server::dirs (
|
||||
|
||||
) inherits confdroid_apache::params {
|
||||
require confdroid_apache::server::user
|
||||
|
||||
if $ae_manage_dirs == true {
|
||||
# create main dir
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
## confdroid_apache::server:;user.pp
|
||||
# Module name: confdroid_apache
|
||||
# Author: 12ww1160 (12ww1160@confdroid.com)
|
||||
# @summary manage all aspects of the httpd service user, if enabled
|
||||
##############################################################################
|
||||
class confdroid_apache::server::user (
|
||||
|
||||
) inherits confdroid_apache::params {
|
||||
require confdroid_apache::server::install
|
||||
|
||||
if $ae_manage_user == true {
|
||||
group { $ae_user_name:
|
||||
ensure => present,
|
||||
name => $ae_user_name,
|
||||
gid => $ae_user_uid,
|
||||
allowdupe => false,
|
||||
}
|
||||
|
||||
user { $ae_user_name:
|
||||
ensure => present,
|
||||
name => $ae_user_name,
|
||||
allowdupe => false,
|
||||
comment => $ae_u_comment,
|
||||
uid => $ae_user_uid,
|
||||
gid => $ae_user_name,
|
||||
groups => $ae_u_groups,
|
||||
managehome => true,
|
||||
home => $ae_user_home,
|
||||
shell => $ae_user_shell,
|
||||
require => Group[$ae_user_name],
|
||||
}
|
||||
}
|
||||
|
||||
else {
|
||||
# do nothing
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user