Order of the classes parameters is refactored
Order of those parameters is changed to follow Puppet Style Guide recommendation [0]. Moreover, it will allow to an user to find much faster a variable in a list of variables. [0]. https://docs.puppetlabs.com/guides/style_guide.html Change-Id: If49d32d7e0beef5dc5c19b085be48659d3882f5f
This commit is contained in:
Andrey Nikitin
parent
ec11c36753
commit
ea321de151
|
|
@ -7,33 +7,33 @@
|
|||
class askbot::config (
|
||||
$db_password,
|
||||
$redis_password,
|
||||
$site_root = '/srv/askbot-site',
|
||||
$dist_root = '/srv/dist',
|
||||
$www_group = 'www-data',
|
||||
$db_provider = 'www-data',
|
||||
$db_name = 'askbotdb',
|
||||
$db_user = 'askbot',
|
||||
$db_host = 'localhost',
|
||||
$askbot_debug = false,
|
||||
$custom_theme_enabled = false,
|
||||
$custom_theme_name = undef,
|
||||
$db_host = 'localhost',
|
||||
$db_name = 'askbotdb',
|
||||
$db_provider = 'www-data',
|
||||
$db_user = 'askbot',
|
||||
$dist_root = '/srv/dist',
|
||||
$redis_enabled = false,
|
||||
$redis_prefix = 'askbot',
|
||||
$redis_port = 6378,
|
||||
$redis_max_memory = '256m',
|
||||
$redis_bind = '127.0.0.1',
|
||||
$site_ssl_enabled = false,
|
||||
$site_ssl_cert_file_contents = undef,
|
||||
$site_ssl_key_file_contents = undef,
|
||||
$site_ssl_chain_file_contents = undef,
|
||||
$site_ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem',
|
||||
$site_ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key',
|
||||
$site_ssl_chain_file = undef,
|
||||
$site_name = 'askbot',
|
||||
$custom_theme_enabled = false,
|
||||
$custom_theme_name = undef,
|
||||
$site_root = '/srv/askbot-site',
|
||||
$site_ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem',
|
||||
$site_ssl_cert_file_contents = undef,
|
||||
$site_ssl_chain_file = undef,
|
||||
$site_ssl_chain_file_contents = undef,
|
||||
$site_ssl_enabled = false,
|
||||
$site_ssl_key_file_contents = undef,
|
||||
$site_ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key',
|
||||
$solr_enabled = false,
|
||||
$smtp_port = 25,
|
||||
$smtp_host = 'localhost',
|
||||
$smtp_port = 25,
|
||||
$template_settings = 'askbot/settings.py.erb',
|
||||
$www_group = 'www-data',
|
||||
) {
|
||||
file { $site_root:
|
||||
ensure => directory,
|
||||
|
|
|
|||
|
|
@ -57,19 +57,19 @@
|
|||
class askbot (
|
||||
$db_password,
|
||||
$redis_password,
|
||||
$dist_root = '/srv/dist',
|
||||
$site_root = '/srv/askbot-site',
|
||||
$askbot_branch = 'master',
|
||||
$askbot_debug = false,
|
||||
$askbot_ensure = 'present',
|
||||
$askbot_tag = undef,
|
||||
$askbot_revision = undef,
|
||||
$askbot_repo = 'https://github.com/ASKBOT/askbot-devel.git',
|
||||
$www_group = 'www-data',
|
||||
$www_user = 'www-data',
|
||||
$db_provider = 'mysql',
|
||||
$db_name = 'askbotdb',
|
||||
$db_user = 'askbot',
|
||||
$custom_theme_enabled = false,
|
||||
$custom_theme_name = undef,
|
||||
$db_host = 'localhost',
|
||||
$askbot_debug = false,
|
||||
$db_name = 'askbotdb',
|
||||
$db_provider = 'mysql',
|
||||
$db_user = 'askbot',
|
||||
$dist_root = '/srv/dist',
|
||||
$redis_enabled = false,
|
||||
$redis_prefix = 'askbot',
|
||||
$redis_port = 6378,
|
||||
|
|
@ -83,13 +83,13 @@ class askbot (
|
|||
$site_ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key',
|
||||
$site_ssl_chain_file = undef,
|
||||
$site_name = 'askbot',
|
||||
$custom_theme_enabled = false,
|
||||
$custom_theme_name = undef,
|
||||
$site_root = '/srv/askbot-site',
|
||||
$solr_enabled = false,
|
||||
$smtp_port = '25',
|
||||
$smtp_host = 'localhost',
|
||||
$smtp_port = '25',
|
||||
$template_settings = 'askbot/settings.py.erb',
|
||||
$askbot_ensure = 'present',
|
||||
$www_group = 'www-data',
|
||||
$www_user = 'www-data',
|
||||
) {
|
||||
|
||||
class { '::askbot::install':
|
||||
|
|
|
|||
|
|
@ -1,24 +1,24 @@
|
|||
# == Class: askbot::site::config
|
||||
# This class configure and askbot site
|
||||
class askbot::site::config (
|
||||
$site_root,
|
||||
$dist_root,
|
||||
$db_provider,
|
||||
$db_name,
|
||||
$db_user,
|
||||
$db_password,
|
||||
$db_host,
|
||||
$askbot_debug,
|
||||
$smtp_host,
|
||||
$smtp_port,
|
||||
$custom_theme_enabled,
|
||||
$custom_theme_name,
|
||||
$db_host,
|
||||
$db_name,
|
||||
$db_password,
|
||||
$db_provider,
|
||||
$db_user,
|
||||
$redis_enabled,
|
||||
$redis_prefix,
|
||||
$redis_port,
|
||||
$redis_max_memory,
|
||||
$redis_bind,
|
||||
$redis_password,
|
||||
$custom_theme_enabled,
|
||||
$custom_theme_name,
|
||||
$dist_root,
|
||||
$site_root,
|
||||
$smtp_host,
|
||||
$smtp_port,
|
||||
$solr_enabled,
|
||||
$template_settings,
|
||||
) {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# == Class: askbot::site::http
|
||||
# This class describes the http server configuration
|
||||
class askbot::site::http (
|
||||
$site_root,
|
||||
$site_name,
|
||||
$site_root,
|
||||
$site_template = 'askbot/askbot.vhost.erb',
|
||||
) {
|
||||
::httpd::vhost { $site_name:
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
# - $dest_dir: destination directory of target files.
|
||||
#
|
||||
define askbot::site::setup_template (
|
||||
$template_path,
|
||||
$dest_dir,
|
||||
$template_path,
|
||||
) {
|
||||
file { "${dest_dir}/${name}":
|
||||
ensure => present,
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
# This class describes the http server's SSL configuration
|
||||
class askbot::site::ssl (
|
||||
$site_name,
|
||||
$site_ssl_cert_file_contents = undef,
|
||||
$site_ssl_key_file_contents = undef,
|
||||
$site_ssl_chain_file_contents = undef,
|
||||
$site_ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem',
|
||||
$site_ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key',
|
||||
$site_ssl_cert_file_contents = undef,
|
||||
$site_ssl_chain_file = undef,
|
||||
$site_ssl_chain_file_contents = undef,
|
||||
$site_ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key',
|
||||
$site_ssl_key_file_contents = undef,
|
||||
) {
|
||||
include ::httpd::ssl
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue