From c646c3d5b4772c061fda8b8d8abfac9c1974c033 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Sun, 30 Aug 2020 18:03:44 +0200 Subject: [PATCH] Update mediawiki cookbook (Kosmos fork) --- Berksfile | 13 ++++++------- Berksfile.lock | 7 ++----- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Berksfile b/Berksfile index 7ffb698..1db64f4 100644 --- a/Berksfile +++ b/Berksfile @@ -3,13 +3,12 @@ source 'https://supermarket.chef.io' cookbook 'mediawiki', - git: 'https://github.com/67P/mediawiki-cookbook.git', - ref: '55a4680ee298199fa5f7fa51b5c589fbfa52eed0' + git: 'https://github.com/67P/mediawiki-cookbook.git', + ref: 'nginx' cookbook 'redis', - git: 'https://github.com/phlipper/chef-redis.git', - ref: 'v0.5.6' + git: 'https://github.com/phlipper/chef-redis.git', + ref: 'v0.5.6' cookbook 'postfix', '= 5.0.2' -cookbook 'php-fpm', '~> 0.8.0' cookbook 'php', '~> 6.1.1' cookbook 'composer', '~> 2.6.1' cookbook 'poise-ruby-build', '~> 1.1.0' @@ -47,8 +46,8 @@ cookbook 'compat_resource', '= 12.19.0' cookbook 'homebrew', '= 3.0.0' cookbook 'mariadb', '= 0.3.1' cookbook 'ipfs', - git: 'https://gitea.kosmos.org/kosmos/ipfs-cookbook.git', - ref: 'v0.4.1' + git: 'https://gitea.kosmos.org/kosmos/ipfs-cookbook.git', + ref: 'v0.4.1' cookbook 'elasticsearch', '= 4.2.0' cookbook 'java', '~> 4.3.0' cookbook 'ulimit', '~> 1.0.0' diff --git a/Berksfile.lock b/Berksfile.lock index 1e3996b..cfefcac 100644 --- a/Berksfile.lock +++ b/Berksfile.lock @@ -25,8 +25,8 @@ DEPENDENCIES mariadb (= 0.3.1) mediawiki git: https://github.com/67P/mediawiki-cookbook.git - revision: 55a4680ee298199fa5f7fa51b5c589fbfa52eed0 - ref: 55a4680 + revision: 78641e53635ba6cbd4a2a51fd597adb8fef1e8ad + ref: nginx mysql (~> 8.5.1) nginx (= 9.0.0) nodejs (~> 5.0.0) @@ -34,7 +34,6 @@ DEPENDENCIES ohai (~> 5.2.5) openssl (~> 8.5.5) php (~> 6.1.1) - php-fpm (~> 0.8.0) poise (~> 2.8.2) poise-archive (~> 1.5.0) poise-javascript @@ -107,7 +106,6 @@ GRAPH apache2 (>= 0.0.0) nginx (>= 0.0.0) php (>= 0.0.0) - php-fpm (>= 0.0.0) mingw (2.1.0) seven_zip (>= 0.0.0) mysql (8.5.1) @@ -124,7 +122,6 @@ GRAPH php (6.1.1) build-essential (>= 5.0) yum-epel (>= 0.0.0) - php-fpm (0.8.0) poise (2.8.2) poise-archive (1.5.0) poise (~> 2.6)