confdroid/confdroid_apache
3
0
Fork 0
Code Issues Projects Wiki Activity

OP#410 fix basic errrors

Browse Source
This commit is contained in:
12ww1160
2026-02-03 01:15:33 +01:00
parent 768f98cb09
commit e93cf3c795
4 changed files with 5 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -35,7 +35,6 @@ Installation
Configuration Configuration
* manage user settings (optional)
* manage directory structure (optional) * manage directory structure (optional)
* manage configuration files (optional): * manage configuration files (optional):
* file system permissions * file system permissions
@@ -106,6 +105,7 @@ All files and directories are configured with correct selinux context. If selinu
## Contact Us ## Contact Us
[contact Us](https://confdroid.com/contact/) [contact Us](https://confdroid.com/contact/)
[Feedback Portal](https://feedback.confdroid.com/)
## Disclaimer ## Disclaimer

18
manifests/params.pp
View File

@@ -4,8 +4,7 @@
# @summary This class holds all parameters for the confdroid_apache module, which are # @summary This class holds all parameters for the confdroid_apache module, which are
# inherited by all classes except defines. # inherited by all classes except defines.
# @param [String] pkg_ensure Specify which # @param [String] pkg_ensure Specify which
# [package type] (https://confdroid.com/2017/05/puppet-type-package/) # package type to use, i.e. `latest`, `present` or `absent`.
# to use, i.e. `latest`, `present` or `absent`.
# @param [Boolean] ae_manage_user Whether or not to manage details for the # @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 # 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 # 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_https_port the port to use for the https protocol
# @param [String] ae_target_service which service to monitor with nagios # @param [String] ae_target_service which service to monitor with nagios
# @param [Boolean] ae_manage_fw whether to manage firewall settings # @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 ( class confdroid_apache::params (
# installation # installation
String $pkg_ensure = 'latest', String $pkg_ensure = 'present',
String $reqpackages = ['httpd','mod_ssl'], Array $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',
# configuration files # configuration files
Boolean $ae_manage_cfg = false, Boolean $ae_manage_cfg = false,

1
manifests/server/dirs.pp
View File

@@ -7,7 +7,6 @@
class confdroid_apache::server::dirs ( class confdroid_apache::server::dirs (
) inherits confdroid_apache::params { ) inherits confdroid_apache::params {
require confdroid_apache::server::user
if $ae_manage_dirs == true { if $ae_manage_dirs == true {
# create main dir # create main dir

37
manifests/server/user.pp
View File

@@ -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
}
}