diff --git a/manifests/firewall.pp b/manifests/firewall.pp index b71080ac01689cc1ce2fd660ba3b5664bf091f9f..62d485ec644c230bc5644c7a4bc354579b635cc0 100644 --- a/manifests/firewall.pp +++ b/manifests/firewall.pp @@ -1,20 +1,20 @@ # Class for skadereg firewall class aim_control::firewall { firewalld_rich_rule { 'Allow 33060 from liu ipv4': - ensure => present, - zone => 'liu', - source => { 'ipset' => 'liu-nets_v4' }, - port => { 'port' => 33060, 'protocol' => 'tcp' }, - family => 'ipv4', - action => 'accept', + ensure => present, + zone => 'liu', + source => { 'ipset' => 'liu-nets_v4' }, + port => { 'port' => 33060, 'protocol' => 'tcp' }, + family => 'ipv4', + action => 'accept', } firewalld_rich_rule { 'Allow 33060 from liu ipv6': - ensure => present, - zone => 'liu', - source => { 'ipset' => 'liu-nets_v6' }, - port => { 'port' => 33060, 'protocol' => 'tcp' }, - family => 'ipv6', - action => 'accept', + ensure => present, + zone => 'liu', + source => { 'ipset' => 'liu-nets_v6' }, + port => { 'port' => 33060, 'protocol' => 'tcp' }, + family => 'ipv6', + action => 'accept', } firewalld_rich_rule { 'Allow ssh from liu 10.243.0.0/16': ensure => present, diff --git a/manifests/init.pp b/manifests/init.pp index 7cad1db1f6d8f0a4ba2d29a74f616b96550b3f11..46ea4f78718f68e667346c9f43236a5f218ac43b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -83,10 +83,10 @@ class aim_control ( include liurepo::remi exec { 'enable remi-php74': - command => 'dnf module enable php:remi-7.4 -y', - path => ['/bin', '/usr/bin'], + command => 'dnf module enable php:remi-7.4 -y', + path => ['/bin', '/usr/bin'], unless => 'dnf module list php:remi-7.4 | grep -q "[e]"', - require => Class['liurepo::remi'], + require => Class['liurepo::remi'], } class { 'apache::mod::php': @@ -97,15 +97,15 @@ class aim_control ( package { 'php74-php-pdo': - ensure => installed; + ensure => installed; 'php74-php-mbstring': - ensure => installed; + ensure => installed; 'php74-php-mysqlnd': - ensure => installed; + ensure => installed; 'php74-php-common': - ensure => installed; + ensure => installed; 'php74-php': - ensure => installed; + ensure => installed; } file { '/etc/httpd/modules/libphp7.so': @@ -165,7 +165,7 @@ class aim_control ( directoryindex => 'index.php', } ], - require => Vcsrepo['/var/www/skadereg'], + require => Vcsrepo['/var/www/skadereg'], } file { '/var/www/skadereg/.env': @@ -209,7 +209,7 @@ class aim_control ( 'socket' => '/var/lib/mysql/mysql.sock', }, }, - restart => true, + restart => true, } mysql::db { $db_name: @@ -255,10 +255,10 @@ class aim_control ( # Ensure the MySQL directory is managed properly file { '/var/lib/mysql': - ensure => 'directory', - owner => 'mysql', - group => 'mysql', - mode => '0755', + ensure => 'directory', + owner => 'mysql', + group => 'mysql', + mode => '0755', require => Class['mysql::server'], # Ensure MySQL is configured before setting permissions } } diff --git a/manifests/remirepo.pp b/manifests/remirepo.pp index f3b6d959b9059762e96402fa3037df4f9f617877..c232edd3686883976c62efb1e4390c6127204a0e 100644 --- a/manifests/remirepo.pp +++ b/manifests/remirepo.pp @@ -1,23 +1,23 @@ class aim_control::remirepo { - package { 'epel-release': - ensure => installed, - provider => 'dnf', - before => Package['remi-release'], - } + package { 'epel-release': + ensure => installed, + provider => 'dnf', + before => Package['remi-release'], + } - # Ensure the Remi release package is installed - package { 'remi-release': - ensure => installed, - provider => 'rpm', - source => 'https://rpms.remirepo.net/enterprise/remi-release-9.rpm', - before => Exec['enable remi-php74'], - } + # Ensure the Remi release package is installed + package { 'remi-release': + ensure => installed, + provider => 'rpm', + source => 'https://rpms.remirepo.net/enterprise/remi-release-9.rpm', + before => Exec['enable remi-php74'], + } - # Enable PHP 7.4 module - exec { 'enable remi-php74': - command => 'dnf module enable php:remi-7.4 -y', - path => ['/bin', '/usr/bin'], - refreshonly => true, - require => Package['remi-release'], - } + # Enable PHP 7.4 module + exec { 'enable remi-php74': + command => 'dnf module enable php:remi-7.4 -y', + path => ['/bin', '/usr/bin'], + refreshonly => true, + require => Package['remi-release'], } +}