diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-11-06 17:38:49 +0100 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-11-06 18:30:51 +0100 |
| commit | 514b0f86cce5995d5819cab4a6305f31e5865436 (patch) | |
| tree | 8becdc87b3ae6c6340cbf67ffce5f5f49f469279 | |
| parent | Fix wireguard peer parameter. (diff) | |
| download | profiles-514b0f86cce5995d5819cab4a6305f31e5865436.tar.gz profiles-514b0f86cce5995d5819cab4a6305f31e5865436.tar.xz | |
Introduce hiera + fix php fpm.
| -rw-r--r-- | data/os/Ubuntu/20.04.yaml | 1 | ||||
| -rw-r--r-- | data/os/Ubuntu/22.04.yaml | 1 | ||||
| -rw-r--r-- | hiera.yaml | 15 | ||||
| -rw-r--r-- | manifests/phpfpm.pp | 2 |
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 |