From bb6d88203af7c03ecd8ae08fc6f713066f7d9df3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?=
<hugo.hornquist@liuformulastudent.se>
Date: Wed, 12 Aug 2020 21:12:02 +0000
Subject: [PATCH] Force wordpress installation to be www-data editable.
---
.gitmodules | 3 +++
modules/chmod_r | 1 +
modules/wordpress/manifests/init.pp | 5 ++++-
3 files changed, 8 insertions(+), 1 deletion(-)
create mode 160000 modules/chmod_r
diff --git a/.gitmodules b/.gitmodules
index 3f30104..5c7397b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -55,3 +55,6 @@
[submodule "modules/network"]
path = modules/network
url = https://github.com/example42/puppet-network.git
+[submodule "modules/chmod_r"]
+ path = modules/chmod_r
+ url = https://github.com/declarativesystems/chmod_r
diff --git a/modules/chmod_r b/modules/chmod_r
new file mode 160000
index 0000000..8e459b8
--- /dev/null
+++ b/modules/chmod_r
@@ -0,0 +1 @@
+Subproject commit 8e459b8dcf93d046c1a8a2810cac6f34e10cff6e
diff --git a/modules/wordpress/manifests/init.pp b/modules/wordpress/manifests/init.pp
index 35260e5..f06f5f7 100644
--- a/modules/wordpress/manifests/init.pp
+++ b/modules/wordpress/manifests/init.pp
@@ -31,7 +31,6 @@ define wordpress (
ensure => directory,
source => "${wp_root}/wordpress",
recurse => remote,
- # TODO ensure that all files keep belonging to www-data
owner => 'www-data',
group => 'www-data',
}
@@ -48,6 +47,10 @@ define wordpress (
}),
}
+ chmod_r { $wp_path:
+ want_mode => '0664',
+ }
+
file { "/var/wordpress_dump/${url}":
ensure => directory,
}
--
GitLab