Merge branch 'jenkins-build-1' into 'master'

Auto-merge for build 1

See merge request puppet/confdroid_ssh!1

README.md

@@ -23,11 +23,6 @@
 
 ## Features
 
-- install required binaries
-- manage configuration based on parameters
-- manage service
-- (optional) manage firewall
-  
 ## Support
 
 - Rocky 9

manifests/firewall/iptables.pp

@@ -1,17 +0,0 @@
-## confdroid_ssh::firewall::iptables.pp
-# Module name: confdroid_ssh
-# Author: 12ww1160 (12ww1160@confdroid.com)
-# @summary Class manages firewall rules for SSH
-##############################################################################
-class confdroid_ssh::firewall::iptables (
-
-) inherits confdroid_ssh::params {
-  if $ssh_use_firewall {
-    firewall { "${ssh_fw_order}${ssh_fw_port} allow SSH on port ${ssh_fw_port}":
-      ensure => 'present',
-      jump   => 'accept',
-      proto  => 'tcp',
-      dport  => $ssh_fw_port,
-    }
-  }
-}

manifests/main/install.pp

@@ -5,7 +5,7 @@
 ##############################################################################
 class confdroid_ssh::main::install (
 ) inherits confdroid_ssh::params {
-  package { $ssh_reqpackages:
+  package { $reqpackages:
     ensure => $pkg_ensure,
   }
 }

manifests/main/service.pp

@@ -6,9 +6,6 @@
 class confdroid_ssh::main::service (
 ) inherits confdroid_ssh::params {
   require confdroid_ssh::main::files
-  if $ssh_use_firewall {
-    require confdroid_ssh::firewall::iptables
-  }
 
   service { $sshd_service:
     ensure     => running,

manifests/params.pp

@@ -2,21 +2,13 @@
 # Module name: confdroid_ssh
 # Author: 12ww1160 (12ww1160@confdroid.com)
 # @summary Class contains all class parameters for confdroid_ssh
-# @param [Array] ssh_reqpackages packages to install
+# @param [Array] reqpackages packages to install
 # @param [String] pkg_ensure version to install: 'present' or 'latest'
-# @param [Boolean] ssh_use_firewall whether to manage firewall settings
-# @param [String] ssh_fw_port port to use for SSHD and in fw
-# @param [String] ssh_fw_order order of firewall rule
 ##############################################################################
 class confdroid_ssh::params (
 
-  Array $ssh_reqpackages  = ['openssh','openssh-clients','openssh-server'],
-  String $pkg_ensure      = 'present',
-
-  # firewall settings
-  Boolean $ssh_use_firewall  = true,
-  String $ssh_fw_port        = '22',
-  String $ssh_fw_order       = '50',
+  Array $reqpackages  = ['openssh','openssh-clients','openssh-server'],
+  String $pkg_ensure  = 'present',
 
 ) {
 # default facts