Drop the java cookbook dependency
The java cookbook's openjdk recipe unconditionally adds the dead openjdk-r PPA on Ubuntu and cannot be told not to, which breaks on Ubuntu 24.04. Elasticsearch 7.x ships a bundled JDK and no JAVA_HOME is configured, so no system Java is needed.
This commit is contained in:
2 files changed
+3
-2
No files matched your search
@@ -8,7 +8,6 @@ version '0.2.1'
|
||||
|
||||
depends 'backup'
|
||||
depends 'elasticsearch'
|
||||
depends 'java'
|
||||
depends 'firewall'
|
||||
depends 'postgresql'
|
||||
depends 'kosmos-nodejs'
|
||||
|
||||
@@ -9,11 +9,13 @@
|
||||
node.override["kosmos_nodejs"]["version"] = node["kosmos-mastodon"]["nodejs_version"]
|
||||
|
||||
include_recipe "kosmos-nodejs"
|
||||
include_recipe "java"
|
||||
include_recipe "firewall"
|
||||
|
||||
elasticsearch_user 'elasticsearch'
|
||||
|
||||
# Elasticsearch 7.x ships a bundled JDK and no JAVA_HOME is configured, so no
|
||||
# system Java is needed (the java cookbook's openjdk recipe no longer supports
|
||||
# Ubuntu 24.04 anyway).
|
||||
elasticsearch_install 'elasticsearch' do
|
||||
type 'package'
|
||||
# The current version of the elasticsearch cookbook doesn't like versions
|
||||
|
||||
Reference in new issue
Block a user