OP#409 initial commit after fork

This commit is contained in:
12ww1160
2026-02-03 00:41:35 +01:00
parent 3fe5000d8e
commit 526aed6b88
27 changed files with 256 additions and 221 deletions

View File

@@ -1,7 +1,7 @@
## cd_apache::params.pp
# Module name: cd_apache
# Author: Arne Teuke (arne_teuke@confdroid.com)
# @summary This class holds all parameters for the cd_apache module, which are
## confdroid_apache::params.pp
# Module name: confdroid_apache
# Author: 12ww1160 (12ww1160@confdroid.com)
# @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/)
@@ -29,7 +29,7 @@
# configuration. httpd is very often a sub system used by many other services,
# and the required configuration depends on the use case. If using httpd as
# sub-service ( i.e. for phpmyadmin, Nagios etc.), the main configuration
# should be done on that end, not in cd_apache. IN that case, set `ae_manage_cfg`
# should be done on that end, not in confdroid_apache. IN that case, set `ae_manage_cfg`
# to `false`.
# @param [Boolean] ae_manage_dirs Whether or not main directories required
# to run httpd should be managed. Typically this should be set to true.
@@ -44,7 +44,7 @@
# @param [Boolean] ae_manage_fw whether to manage firewall settings
# @param [String] reqpackages List of packages to install.
###########################################################################
class cd_apache::params (
class confdroid_apache::params (
# installation
String $pkg_ensure = 'latest',
@@ -95,18 +95,18 @@ class cd_apache::params (
# files
$ae_conf_file = "${ae_conf_dir}/httpd.conf"
$ae_conf_file_erb = 'cd_apache/httpd_conf.erb'
$ae_conf_file_erb = 'confdroid_apache/httpd_conf.erb'
$ae_magic_file = "${ae_conf_dir}/magic"
$ae_magic_file_erb = 'cd_apache/magic.erb'
$ae_magic_file_erb = 'confdroid_apache/magic.erb'
$ae_ssl_file = "${ae_conf_d_dir}/ssl.conf"
$ae_ssl_file_erb = 'cd_apache/ssl_conf.erb'
$ae_ssl_file_erb = 'confdroid_apache/ssl_conf.erb'
$ae_autoindex_file = "${ae_conf_d_dir}/autoindex.conf"
$ae_autoindex_erb = 'cd_apache/autoindex_conf.erb'
$ae_autoindex_erb = 'confdroid_apache/autoindex_conf.erb'
$ae_userdir_file = "${ae_conf_d_dir}/userdir.conf"
$ae_userdir_erb = 'cd_apache/userdir_conf.erb'
$ae_userdir_erb = 'confdroid_apache/userdir_conf.erb'
$ae_index_file = '/var/www/html/index.html'
$ae_index_erb = 'cd_apache/index_html.erb'
$ae_index_erb = 'confdroid_apache/index_html.erb'
# includes must be last
include cd_apache::main::config
include confdroid_apache::main::config
}