summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/os/Ubuntu/20.04.yaml1
-rw-r--r--data/os/Ubuntu/22.04.yaml1
-rw-r--r--hiera.yaml15
-rw-r--r--manifests/phpfpm.pp2
4 files changed, 18 insertions, 1 deletions
diff --git a/data/os/Ubuntu/20.04.yaml b/data/os/Ubuntu/20.04.yaml
new file mode 100644
index 0000000..86cbe87
--- /dev/null
+++ b/data/os/Ubuntu/20.04.yaml
@@ -0,0 +1 @@
+profiles::phpfpm::version: '7.4'
diff --git a/data/os/Ubuntu/22.04.yaml b/data/os/Ubuntu/22.04.yaml
new file mode 100644
index 0000000..4da9ad0
--- /dev/null
+++ b/data/os/Ubuntu/22.04.yaml
@@ -0,0 +1 @@
+profiles::phpfpm::version: '8.1'
diff --git a/hiera.yaml b/hiera.yaml
new file mode 100644
index 0000000..a2e55a8
--- /dev/null
+++ b/hiera.yaml
@@ -0,0 +1,15 @@
+version: 5
+defaults:
+ datadir: data
+ data_hash: yaml_data
+hierarchy:
+ - name: OS specific
+ paths:
+ - os/%{facts.os.name}/%{facts.os.release.major}.yaml
+ - os/%{facts.os.family}/%{facts.os.release.major}.yaml
+ - os/%{facts.os.name}.yaml
+ - os/%{facts.os.family}.yaml
+ - name: Common
+ path: common.yaml
+
+
diff --git a/manifests/phpfpm.pp b/manifests/phpfpm.pp
index 2aaf0df..927a32f 100644
--- a/manifests/phpfpm.pp
+++ b/manifests/phpfpm.pp
@@ -12,7 +12,7 @@ class profiles::phpfpm (
}
systemd::dropin_file { 'runtime-dir.conf':
- unit => 'php${version}-fpm.service',
+ unit => "php${version}-fpm.service",
content => @(EOF)
[Service]
RuntimeDirectory=php