diff --git a/.devcontainer/README.md b/.devcontainer/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..cc4675e5ddb912f2284a6741ec440ed812730d37
--- /dev/null
+++ b/.devcontainer/README.md
@@ -0,0 +1,34 @@
+# devcontainer
+
+
+For format details, see https://aka.ms/devcontainer.json.
+
+For config options, see the README at:
+https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/puppet
+
+``` json
+{
+ "name": "Puppet Development Kit (Community)",
+ "dockerFile": "Dockerfile",
+
+ // Set *default* container specific settings.json values on container create.
+ "settings": {
+ "terminal.integrated.shell.linux": "/bin/bash"
+ },
+
+ // Add the IDs of extensions you want installed when the container is created.
+ "extensions": [
+ "puppet.puppet-vscode",
+ "rebornix.Ruby"
+ ]
+
+ // Use 'forwardPorts' to make a list of ports inside the container available locally.
+ "forwardPorts": [],
+
+ // Use 'postCreateCommand' to run commands after the container is created.
+ "postCreateCommand": "pdk --version",
+}
+```
+
+
+
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f1a55dc3f0acb1031982196149da8edcb1a2d6ef..fe7a8b12b998dab13c95cce183eec95e387ae6bc 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,23 +1,17 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/puppet
{
"name": "Puppet Development Kit (Community)",
"dockerFile": "Dockerfile",
- // Set *default* container specific settings.json values on container create.
"settings": {
- "terminal.integrated.shell.linux": "/bin/bash"
+ "terminal.integrated.profiles.linux": {
+ "bash": {
+ "path": "bash",
+ }
+ }
},
- // Add the IDs of extensions you want installed when the container is created.
"extensions": [
"puppet.puppet-vscode",
"rebornix.Ruby"
]
-
- // Use 'forwardPorts' to make a list of ports inside the container available locally.
- // "forwardPorts": [],
-
- // Use 'postCreateCommand' to run commands after the container is created.
- // "postCreateCommand": "pdk --version",
}
diff --git a/Rakefile b/Rakefile
index 2906c15babbebe65d3ed29e72a07328609fefe8e..0f8754eb61e400db1d117cad5026f06d3ba6ff89 100644
--- a/Rakefile
+++ b/Rakefile
@@ -43,6 +43,7 @@ end
PuppetLint.configuration.send('disable_relative')
+
if Bundler.rubygems.find_name('github_changelog_generator').any?
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
diff --git a/manifests/init.pp b/manifests/init.pp
index c25e33ac10e92af245a697aa8cc09ff7c0a29a87..71ea45abc03d2187bca6d927311f3f1483192172 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -34,7 +34,7 @@ class aim_control(
String $skadereg_ro_user = 'skadereg_ro',
){
- ::users::liu_user {
+ users::liu_user {
'samla949':
commonname => 'Samuel Larsson',
shell => '/bin/bash',
@@ -62,38 +62,38 @@ class aim_control(
'apache',
],
require => [
- ::Users::Liu_user['samla949'],
+ Users::Liu_user['samla949'],
],
}
include aim_control::firewall
- include apache
- include aim_control::remirepo
-
- class { 'apache::mod::php':
- package_name => 'php74',
- php_version => '7',
- }
- include apache::mod::rewrite
-
- package {
- 'php74-php-pdo':
- ensure => installed;
- 'php74-php-mbstring':
- ensure => installed;
- 'php74-php-mysqlnd':
- ensure => installed;
- 'php74-php-common':
- ensure => installed;
- 'php74-php':
- ensure => installed;
- }
-
- file { '/etc/httpd/modules/libphp7.so':
- ensure => link,
- target => '/opt/remi/php74/root/usr/lib64/httpd/modules/libphp7.so',
- before => Service['httpd'],
- }
+ #include apache
+ include liurepo::remi
+
+ # class { 'apache::mod::php':
+ # package_name => 'php74',
+ # php_version => '7',
+ # }
+ # include apache::mod::rewrite
+
+ # package {
+ # 'php74-php-pdo':
+ # ensure => installed;
+ # 'php74-php-mbstring':
+ # ensure => installed;
+ # 'php74-php-mysqlnd':
+ # ensure => installed;
+ # 'php74-php-common':
+ # ensure => installed;
+ # 'php74-php':
+ # ensure => installed;
+ # }
+
+ # file { '/etc/httpd/modules/libphp7.so':
+ # ensure => link,
+ # target => '/opt/remi/php74/root/usr/lib64/httpd/modules/libphp7.so',
+ # before => Service['httpd'],
+ # }
include certdist
@@ -101,131 +101,131 @@ class aim_control(
$chain = "/etc/pki/tls/certs/chain-${facts['networking']['fqdn']}.pem"
$key = "/etc/pki/tls/private/${facts['networking']['fqdn']}.key"
- apache::vhost { 'default:80':
- servername => $facts['networking']['fqdn'],
- default_vhost => true,
- port => '80',
- docroot => '/var/www/html',
- redirect_status => 'permanent',
- redirect_dest => "https://${facts['networking']['fqdn']}/",
- }
-
- apache::vhost { "${facts['networking']['fqdn']}:443":
- servername => $facts['networking']['fqdn'],
- port => '443',
- ssl => true,
- ssl_cert => $cert,
- ssl_chain => $chain,
- ssl_key => $key,
- headers => ['Set Strict-Transport-Security "max-age=31536000"',],
- docroot => '/var/www/skadereg/public',
- docroot_owner => 'apache',
- docroot_group => 'skadereg',
- directories => [
- {
- path => '/var/www/skadereg/public',
- allow_override => [ 'ALL' ],
- directoryindex => 'index.php',
- }
- ],
- }
-
- file { '/var/www/skadereg/':
- ensure => directory,
- owner => 'apache',
- group => 'skadereg',
- mode => '0770',
- recurse => true,
- }
-
- -> vcsrepo { '/var/www/skadereg':
- ensure => latest,
- before => File['/var/www/skadereg/public'],
- provider => git,
- source => 'git@gitlab.liu.se:aim-control/laravel.git',
- user => 'apache',
- group => 'skadereg',
- }
-
- -> file { '/var/www/skadereg/.env':
- ensure => file,
- owner => 'apache',
- group => 'skadereg',
- mode => '0660',
- content => template("${module_name}/dotenv.erb"),
- }
-
- exec { 'artisan migrate':
- command => 'php artisan migrate --force -n',
- cwd => '/var/www/skadereg',
- path => [ '/opt/remi/php74/root/bin/' ],
- refreshonly => true,
- group => 'skadereg',
- user => 'apache',
- subscribe => [ Vcsrepo['/var/www/skadereg'], File[ '/var/www/skadereg' ], ],
- }
-
- cron { 'artisan schedule:run':
- minute => '*',
- hour => '*',
- monthday => '*',
- month => '*',
- weekday => '*',
- user => 'apache',
- environment => [ 'PATH=/opt/remi/php74/root/bin:/usr/bin:/bin', 'SHELL=/bin/bash' ],
- command => 'php /var/www/skadereg/artisan schedule:run &> /dev/null',
- }
-
- $db_name = 'homestead'
-
- class { 'mysql::server':
- root_password => $mysql_password,
- databases => {
- $db_name => {
- ensure => present,
- charset => 'utf8',
- },
- },
- users => {
- "${skadereg_ro_user}@%" => {
- ensure => present,
- password_hash => mysql_password($skadereg_ro_password),
- },
- },
- grants => {
- 'root@%/*.*' => {
- ensure => present,
- options => ['GRANT'],
- privileges => ['ALL'],
- table => '*.*',
- user => 'root@%',
- },
- },
- override_options => {
- mysqld => {
- 'bind-address' => '0.0.0.0',
- port => 33060,
- },
- },
- }
-
- ['entries', 'guardian_confirmations', 'users'].each |String $table| {
- mysql_grant { "${skadereg_ro_user}@%/${db_name}.${table}":
- ensure => present,
- privileges => ['SELECT'],
- table => "${db_name}.${table}",
- user => "${skadereg_ro_user}@%",
- }
- }
-
- class { 'mysql::server::backup':
- backupuser => 'backupuser',
- backuppassword => $mysql_backup_password,
- backupdir => '/root/mysql_backups',
- backupdirmode => '700',
- backupdirowner => 'root',
- backupdirgroup => 'root',
- backuprotate => '7',
- time => ['1','0'],
- }
+ # apache::vhost { 'default:80':
+ # servername => $facts['networking']['fqdn'],
+ # default_vhost => true,
+ # port => '80',
+ # docroot => '/var/www/html',
+ # redirect_status => 'permanent',
+ # redirect_dest => "https://${facts['networking']['fqdn']}/",
+ # }
+
+ # apache::vhost { "${facts['networking']['fqdn']}:443":
+ # servername => $facts['networking']['fqdn'],
+ # port => '443',
+ # ssl => true,
+ # ssl_cert => $cert,
+ # ssl_chain => $chain,
+ # ssl_key => $key,
+ # headers => ['Set Strict-Transport-Security "max-age=31536000"',],
+ # docroot => '/var/www/skadereg/public',
+ # docroot_owner => 'apache',
+ # docroot_group => 'skadereg',
+ # directories => [
+ # {
+ # path => '/var/www/skadereg/public',
+ # allow_override => [ 'ALL' ],
+ # directoryindex => 'index.php',
+ # }
+ # ],
+ # }
+
+ # file { '/var/www/skadereg/':
+ # ensure => directory,
+ # owner => 'apache',
+ # group => 'skadereg',
+ # mode => '0770',
+ # recurse => true,
+ # }
+
+ # -> vcsrepo { '/var/www/skadereg':
+ # ensure => latest,
+ # before => File['/var/www/skadereg/public'],
+ # provider => git,
+ # source => 'git@gitlab.liu.se:aim-control/laravel.git',
+ # user => 'apache',
+ # group => 'skadereg',
+ # }
+
+ # -> file { '/var/www/skadereg/.env':
+ # ensure => file,
+ # owner => 'apache',
+ # group => 'skadereg',
+ # mode => '0660',
+ # content => template("${module_name}/dotenv.erb"),
+ # }
+
+ # exec { 'artisan migrate':
+ # command => 'php artisan migrate --force -n',
+ # cwd => '/var/www/skadereg',
+ # path => [ '/opt/remi/php74/root/bin/' ],
+ # refreshonly => true,
+ # group => 'skadereg',
+ # user => 'apache',
+ # subscribe => [ Vcsrepo['/var/www/skadereg'], File[ '/var/www/skadereg' ], ],
+ # }
+
+ # cron { 'artisan schedule:run':
+ # minute => '*',
+ # hour => '*',
+ # monthday => '*',
+ # month => '*',
+ # weekday => '*',
+ # user => 'apache',
+ # environment => [ 'PATH=/opt/remi/php74/root/bin:/usr/bin:/bin', 'SHELL=/bin/bash' ],
+ # command => 'php /var/www/skadereg/artisan schedule:run &> /dev/null',
+ # }
+
+ # $db_name = 'homestead'
+
+ # class { 'mysql::server':
+ # root_password => $mysql_password,
+ # databases => {
+ # $db_name => {
+ # ensure => present,
+ # charset => 'utf8',
+ # },
+ # },
+ # users => {
+ # "${skadereg_ro_user}@%" => {
+ # ensure => present,
+ # password_hash => mysql_password($skadereg_ro_password),
+ # },
+ # },
+ # grants => {
+ # 'root@%/*.*' => {
+ # ensure => present,
+ # options => ['GRANT'],
+ # privileges => ['ALL'],
+ # table => '*.*',
+ # user => 'root@%',
+ # },
+ # },
+ # override_options => {
+ # mysqld => {
+ # 'bind-address' => '0.0.0.0',
+ # port => 33060,
+ # },
+ # },
+ # }
+
+ # ['entries', 'guardian_confirmations', 'users'].each |String $table| {
+ # mysql_grant { "${skadereg_ro_user}@%/${db_name}.${table}":
+ # ensure => present,
+ # privileges => ['SELECT'],
+ # table => "${db_name}.${table}",
+ # user => "${skadereg_ro_user}@%",
+ # }
+ # }
+
+ # class { 'mysql::server::backup':
+ # backupuser => 'backupuser',
+ # backuppassword => $mysql_backup_password,
+ # backupdir => '/root/mysql_backups',
+ # backupdirmode => '700',
+ # backupdirowner => 'root',
+ # backupdirgroup => 'root',
+ # backuprotate => '7',
+ # time => ['1','0'],
+ # }
}
diff --git a/manifests/remirepo.pp b/manifests/remirepo.pp
deleted file mode 100644
index 7051175740a6022b360723c5e11db7a850f90fd6..0000000000000000000000000000000000000000
--- a/manifests/remirepo.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-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',
- }
-}
diff --git a/metadata.json b/metadata.json
index 0652598f2ae9c360ab15c8742a74393c3dab4941..e4892cc3daa50f0df42320ecd17a47ffd34075ff 100644
--- a/metadata.json
+++ b/metadata.json
@@ -61,7 +61,7 @@
"version_requirement": ">= 6.21.0 < 8.0.0"
}
],
- "pdk-version": "2.2.0",
+ "pdk-version": "2.3.0",
"template-url": "https://gitlab.it.liu.se/puppet-infra/pdk-templates.git#liu",
- "template-ref": "heads/liu-0-gd8925d4"
+ "template-ref": "heads/liu-0-g76c91ed"
}
diff --git a/spec/classes/remirepo_spec.rb b/spec/classes/remirepo_spec.rb
deleted file mode 100644
index 96cceb9e5e3bcae8ec9a73caee5e884d0e3c6c53..0000000000000000000000000000000000000000
--- a/spec/classes/remirepo_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'aim_control::remirepo' do
- on_supported_os.each do |os, os_facts|
- context "on #{os}" do
- let(:facts) { os_facts }
-
- it { is_expected.to compile }
- end
- end
-end