From 50adf1b4b78aea3cb2a02eb0453f717813982050 Mon Sep 17 00:00:00 2001
From: Nils Olof Paulsson <nils.olof.paulsson@liu.se>
Date: Wed, 22 Jul 2020 13:25:39 +0200
Subject: [PATCH] Upgrade to php7
---
manifests/init.pp | 50 ++++++++++++++++++++++---------------------
manifests/remirepo.pp | 17 +++++++++++++++
2 files changed, 43 insertions(+), 24 deletions(-)
create mode 100644 manifests/remirepo.pp
diff --git a/manifests/init.pp b/manifests/init.pp
index 28111d0..5afc449 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -33,54 +33,57 @@ class aim_control(
String $skadereg_ro_password,
String $skadereg_ro_user = 'skadereg_ro',
){
+
::users::liu_user {
- 'andal699':
- commonname => 'Andreas Alvarsson',
+ 'samla949':
+ commonname => 'Samuel Larsson',
shell => '/bin/bash',
- sshkey => 'AAAAB3NzaC1yc2EAAAADAQABAAACAQDCdb9hWgucRRTpDEH1ozBsWXfC+zTnZEO8rrnuqLlwIy23vEaUK7pJ9tQ7AzdR3+fp6yhWBNOlWC9UT70TnVClS1NfXGXHep0J0yWqNnyXcKviKpVB/p9TOVOULrRX9o3oczYxQa4Bi+eYUfk/en2V6O8tIfYtx5AdWUoofdLYNSpCyrHD1xoH7k1/c+OfW0S3fR5f12n/5u8JTHrztDnpy79CfEtwgMr1pCMjOaiM+OIDYlhNJMvlBo5C6mcDls93snctUR1Zef+sJEznb739uw91f5Yqf5FUBLxXCBi3eveJacBVRVg++ZPzyZ9VHIlBz3OPZ1WEjiM/IRJDBXD4I5MoxnM0Urv2wZBr0+G+1cS916KKraMuEfJHf2Qg4O3L3kZY2zNN5DqRmTx1BflTqe2XdPCCMQJiQi37WjE4fOGfNVsAR2VENhw/TMzc8bcagrrIzeBm3dA5e3R7nTfloPufU6IlIwI9qvCmdI2w0rE3Ve6KHtTzWszjsFtVeOzxVzYkG6GQlT1vr867Ayvx8SWE3GixHiIRByw4BEhFVJWNN/DBT88qd61StuIvWEawZ4WiTGNYfh2SVDIy9Jrcp7Nfg1knK1OtYr+wnjO9OrJtePfo0oo9xwQ3GfwCxni8YJKp40BmfWT/fpY9Pmup71adhaPxPHnELGOeVG/fGw==';
+ sshkey => 'AAAAB3NzaC1yc2EAAAADAQABAAACAQCsWZkkOYsZhOu0Eir+VxajCzWbZ238lrA8w6sbcB2RLJOftfseH4GRHfJaif4g21L4JGuyy7bbJ9JfjUpCG7YTXvo4s7lx0kvp+7+uIhdeugvPsCuMkflih1EkKw2n05OVyhEKU+MPHSaL7QAlSqGewLfLdZpYs9fm6S+Uj/WZRs3I4H77KirA9kSgTnw/3MjoZpU/+0MLD8Uly60D1tCGrgE9qx4SKB0f3zWv+7zw5ZPzDDVO+Sr2X6dvl639S7OE+Hygwkkz03shVrC3STJX/Q/c5f6RZ6/wIMnrEBt3vACR3RGigNO7GLY9uh0tA7/xg62RXdIsoz3Zl1QIn0m25G8GJdE6lWR1zRF/IOXZBjvKJjxYtbIrbWyDfjFq8YmM5KokIEqy2v3bW7hYb4YPrXpLjwaZi8FxgKSn+gHBRMB+vFJaR8fuUNXJdnQXxNl9ohyGec5Hzy5kIVE41Xn8gnvg5XAILCL9X3qVVk70hJ28scNdRkiQbkM11mz0h5s9mEzd74eAPlljzFkNBLAWzO0g4xdsr8QiSo3VQ15dzPyBcndl3yNwhPoGAJ7UApdIq3AZqSouykwGBHovNyHBm2F+orhMl35hBydRy0t/9rJ9czfkUfHT7Wolal0cihi8AvvGS7w3jDjxW//nZ724UcBsJh2ODSBMh0hU7Gx5Cw==',
+ client => [ '81.234.79.215' ],
+ }
- 'adrpa878':
- commonname => 'Adrian Palmquist',
- shell => '/bin/bash',
- sshkey => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDZHpLQZ6T5tKhYXK/Mq3BGhAjqUMyb0LfxlTLSn3rpYvsyddLOhHio2tjd1dYL0HhjmV9QbkEL8Qycs9acNJq9qY/Q+hWxvIRaqWXJodSYdOeOBOeGNM6LhNMTup4Y7a/Fn1LlnBXMJgskDjQ6ReP3Lyyba5M8jjb1GaoWJqsQ3Us3WYFwe8BgpWJKZ2fesctrbae+6eP8PFi0OHEnqqpIFZzdLvp9kgEhEbO6mjFXFqvHLNWwWuKsyfJ38nl4yaS9o6hkElM7KIdXawqHpcFWDSI9eo6nQ1mivAMVjBlBE7/qvZh11hJAe/eJSe0ccGtKjVTWAoH9UhxxpgbjYW0X';
+ file { '/etc/sudoers.d/02-serious_sam' :
+ ensure => 'present',
+ owner => 'root',
+ mode => '0660',
+ content => 'samla949 ALL=(ALL) NOPASSWD: ALL',
}
group { 'skadereg':
ensure => present,
members => [
- 'andal699',
- 'adrpa878',
+ 'samla949',
'apache',
],
require => [
- ::Users::Liu_user['andal699'],
- ::Users::Liu_user['adrpa878'],
+ ::Users::Liu_user['samla949'],
],
}
include ::aim_control::firewall
include ::apache
- include ::liurepo::centos_sclo_rh
+ include ::aim_control::remirepo
class { '::apache::mod::php':
- package_name => 'rh-php56-php',
+ package_name => 'php74',
+ php_version => '7',
}
include ::apache::mod::rewrite
package {
- 'rh-php56-php-pdo':
+ 'php74-php-pdo':
ensure => installed;
- 'rh-php56-php-mbstring':
+ 'php74-php-mbstring':
ensure => installed;
- 'rh-php56-php-mysqlnd':
+ 'php74-php-mysqlnd':
ensure => installed;
- 'rh-php56-php-common':
+ 'php74-php-common':
ensure => installed;
}
- file { '/etc/httpd/modules/libphp5.so':
+ file { '/etc/httpd/modules/libphp7.so':
ensure => link,
- target => '/opt/rh/httpd24/root/usr/lib64/httpd/modules/librh-php56-php5.so',
+ target => '/opt/remi/php74/root/usr/lib64/httpd/modules/libphp7.so',
before => Service['httpd'],
}
@@ -128,7 +131,7 @@ class aim_control(
}
-> vcsrepo { '/var/www/skadereg':
- ensure => latest,
+ ensure => latest
before => File['/var/www/skadereg/public'],
provider => git,
source => 'git@gitlab.liu.se:aim-control/laravel.git',
@@ -147,12 +150,11 @@ class aim_control(
exec { 'artisan migrate':
command => 'php artisan migrate --force -n',
cwd => '/var/www/skadereg',
- path => [ '/opt/rh/rh-php56/root/usr/bin' ],
+ path => [ '/opt/remi/php74/root/bin/' ],
refreshonly => true,
group => 'skadereg',
user => 'apache',
-
- subscribe => Vcsrepo['/var/www/skadereg'],
+ subscribe => [ Vcsrepo['/var/www/skadereg'], File[ '/var/www/skadereg' ], ],
}
cron { 'artisan schedule:run':
@@ -162,7 +164,7 @@ class aim_control(
month => '*',
weekday => '*',
user => 'apache',
- environment => [ 'PATH=/opt/rh/rh-php56/root/usr/bin:/usr/bin:/bin', 'SHELL=/bin/bash' ],
+ environment => [ 'PATH=/opt/remi/php74/root/bin:/usr/bin:/bin', 'SHELL=/bin/bash' ],
command => 'php /var/www/skadereg/artisan schedule:run &> /dev/null',
}
diff --git a/manifests/remirepo.pp b/manifests/remirepo.pp
new file mode 100644
index 0000000..7051175
--- /dev/null
+++ b/manifests/remirepo.pp
@@ -0,0 +1,17 @@
+class aim_control::remirepo(
+) {
+
+ package { 'remi-release' :
+ ensure => 'installed',
+ provider => 'yum',
+ source => 'https://rpms.remirepo.net/enterprise/remi-release-7.rpm',
+ notify => Exec[ 'enable remi' ],
+ }
+
+ exec { 'enable remi' :
+ command => 'yum-config-manager --enable remi-php74',
+ path => ['/bin', '/usr/bin' ],
+ refreshonly => true,
+ creates => '/opt/remi',
+ }
+}
--
GitLab