From 1196c5ff3fa6856c550198b8f47b5f35e87c73fa Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Mon, 2 Dec 2019 09:33:39 +0100 Subject: Move app-admin/{graylog2 → graylog} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: https://bugs.gentoo.org/701728 Signed-off-by: Michał Górny --- app-admin/graylog/Manifest | 1 + app-admin/graylog/files/confd-r2 | 12 +++++ app-admin/graylog/files/initd-r2 | 31 ++++++++++++ app-admin/graylog/graylog-2.5.1.ebuild | 87 ++++++++++++++++++++++++++++++++ app-admin/graylog/metadata.xml | 8 +++ app-admin/graylog2/Manifest | 1 - app-admin/graylog2/files/confd-r2 | 12 ----- app-admin/graylog2/files/initd-r2 | 31 ------------ app-admin/graylog2/graylog2-2.5.1.ebuild | 87 -------------------------------- app-admin/graylog2/metadata.xml | 8 --- profiles/updates/4Q-2019 | 1 + 11 files changed, 140 insertions(+), 139 deletions(-) create mode 100644 app-admin/graylog/Manifest create mode 100644 app-admin/graylog/files/confd-r2 create mode 100644 app-admin/graylog/files/initd-r2 create mode 100644 app-admin/graylog/graylog-2.5.1.ebuild create mode 100644 app-admin/graylog/metadata.xml delete mode 100644 app-admin/graylog2/Manifest delete mode 100644 app-admin/graylog2/files/confd-r2 delete mode 100644 app-admin/graylog2/files/initd-r2 delete mode 100644 app-admin/graylog2/graylog2-2.5.1.ebuild delete mode 100644 app-admin/graylog2/metadata.xml diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest new file mode 100644 index 000000000000..43cea02cad9b --- /dev/null +++ b/app-admin/graylog/Manifest @@ -0,0 +1 @@ +DIST graylog-2.5.1.tgz 123878927 BLAKE2B d168579be4d20e3a8081d608247e7101fc5d99ddd2b5f063f94d7e91d4095c6bd016a4bc1be0f0e08b5043b771070312286404ece5eacc51e4a8730dfc13dab1 SHA512 44e2ca00e47a34708cea94b74fdc0f56f3a381f161d25633bdf7685fbcd989937163508f8b47b0869c7daacec6c8bd2c874f9381e196ffb3194eb6e3f96b3ce9 diff --git a/app-admin/graylog/files/confd-r2 b/app-admin/graylog/files/confd-r2 new file mode 100644 index 000000000000..97eac6ac77fa --- /dev/null +++ b/app-admin/graylog/files/confd-r2 @@ -0,0 +1,12 @@ +GRAYLOG_CONFIG_FILE="/etc/graylog2/graylog.conf" +GRAYLOG_DATA_DIR="/var/lib/graylog2" +GRAYLOG_GROUP="graylog" +GRAYLOG_INSTALL_DIR="/usr/share/graylog2" +GRAYLOG_LOG_DIR="/var/log/graylog2" +GRAYLOG_OPTIONS="" +GRAYLOG_USER="graylog" + +JAVA_OPTS="-Djava.library.path=$GRAYLOG_INSTALL_DIR/lib/sigar -Xms1g -Xmx1g -XX:NewRatio=1 -server -XX:+ResizeTLAB -XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled -XX:+CMSClassUnloadingEnabled -XX:+UseParNewGC -XX:-OmitStackTraceInFastThrow" + +# Please adjust according to your bind address +rc_need="net.lo" diff --git a/app-admin/graylog/files/initd-r2 b/app-admin/graylog/files/initd-r2 new file mode 100644 index 000000000000..c6177eef41d0 --- /dev/null +++ b/app-admin/graylog/files/initd-r2 @@ -0,0 +1,31 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/bin/java" +command_args="${JAVA_OPTS} -jar ${GRAYLOG_INSTALL_DIR}/graylog.jar server -f ${GRAYLOG_CONFIG_FILE} --no-pid-file ${GRAYLOG_OPTIONS}" +command_background="true" +command_user="${GRAYLOG_USER}:${GRAYLOG_GROUP}" +pidfile="/run/${RC_SVCNAME}.pid" + +output_log="${GRAYLOG_LOG_DIR}/graylog.stdout.log" +error_log="${GRAYLOG_LOG_DIR}/graylog.stderr.log" +directory="${GRAYLOG_INSTALL_DIR}" +required_files="${GRAYLOG_CONFIG_FILE}" + +depend() { + use dns +} + +start_pre() { + local d + for d in \ + "${GRAYLOG_DATA_DIR}" \ + "${GRAYLOG_DATA_DIR}/data" \ + "${GRAYLOG_DATA_DIR}/data/contentpacks" \ + "${GRAYLOG_DATA_DIR}/data/journal" \ + "${GRAYLOG_LOG_DIR}"; do + + checkpath -d -o "${GRAYLOG_USER}":"${GRAYLOG_GROUP}" -m750 "${d}" + done +} diff --git a/app-admin/graylog/graylog-2.5.1.ebuild b/app-admin/graylog/graylog-2.5.1.ebuild new file mode 100644 index 000000000000..b045b60179ec --- /dev/null +++ b/app-admin/graylog/graylog-2.5.1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit user + +DESCRIPTION="Free and open source log management" +HOMEPAGE="https://www.graylog.org" +SRC_URI="https://packages.graylog2.org/releases/graylog/graylog-${PV}.tgz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +RESTRICT="strip" + +RDEPEND="virtual/jdk:1.8" + +DOCS=( + COPYING README.markdown UPGRADING.rst +) + +GRAYLOG_DATA_DIR="/var/lib/graylog2" +GRAYLOG_INSTALL_DIR="/usr/share/graylog2" +QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*" + +S="${WORKDIR}/graylog-${PV}" + +pkg_setup() { + enewgroup graylog + enewuser graylog -1 -1 -1 graylog +} + +src_prepare() { + default + + # Stick to architecture of build host + if ! use amd64; then + rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries" + fi + if ! use ppc64; then + rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries" + fi + if ! use x86; then + rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries" + fi + # Currently unsupported platforms + # QA warning galore but testing/patches welcome + rm lib/sigar/libsigar-*freebsd*so \ + lib/sigar/libsigar-*solaris*so \ + lib/sigar/libsigar-*hpux*.sl \ + lib/sigar/libsigar-*macosx*.dylib \ + lib/sigar/libsigar-ia64-*.so \ + lib/sigar/libsigar-ppc-*.so \ + lib/sigar/libsigar-s390x*.so \ + lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries" + + # gentoo specific paths + sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \ + s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g; \ + s@#\(content_packs_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/contentpacks@g" \ + graylog.conf.example || die +} + +src_install() { + default + + insinto /etc/graylog2 + doins graylog.conf.example + + insinto "${GRAYLOG_DATA_DIR}/data/contentpacks" + doins data/contentpacks/grok-patterns.json + + insinto "${GRAYLOG_INSTALL_DIR}" + doins graylog.jar + doins -r lib plugin + + newconfd "${FILESDIR}/confd-r2" graylog2 + newinitd "${FILESDIR}/initd-r2" graylog2 +} + +pkg_postinst() { + ewarn "Graylog does not depend on need.net any more (#439092)." + ewarn + ewarn "Please configure rc_need according to your binding address in:" + ewarn "/etc/conf.d/graylog2" +} diff --git a/app-admin/graylog/metadata.xml b/app-admin/graylog/metadata.xml new file mode 100644 index 000000000000..5087760546f6 --- /dev/null +++ b/app-admin/graylog/metadata.xml @@ -0,0 +1,8 @@ + + + + + chainsaw@gentoo.org + Tony Vroon + + diff --git a/app-admin/graylog2/Manifest b/app-admin/graylog2/Manifest deleted file mode 100644 index 43cea02cad9b..000000000000 --- a/app-admin/graylog2/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST graylog-2.5.1.tgz 123878927 BLAKE2B d168579be4d20e3a8081d608247e7101fc5d99ddd2b5f063f94d7e91d4095c6bd016a4bc1be0f0e08b5043b771070312286404ece5eacc51e4a8730dfc13dab1 SHA512 44e2ca00e47a34708cea94b74fdc0f56f3a381f161d25633bdf7685fbcd989937163508f8b47b0869c7daacec6c8bd2c874f9381e196ffb3194eb6e3f96b3ce9 diff --git a/app-admin/graylog2/files/confd-r2 b/app-admin/graylog2/files/confd-r2 deleted file mode 100644 index 97eac6ac77fa..000000000000 --- a/app-admin/graylog2/files/confd-r2 +++ /dev/null @@ -1,12 +0,0 @@ -GRAYLOG_CONFIG_FILE="/etc/graylog2/graylog.conf" -GRAYLOG_DATA_DIR="/var/lib/graylog2" -GRAYLOG_GROUP="graylog" -GRAYLOG_INSTALL_DIR="/usr/share/graylog2" -GRAYLOG_LOG_DIR="/var/log/graylog2" -GRAYLOG_OPTIONS="" -GRAYLOG_USER="graylog" - -JAVA_OPTS="-Djava.library.path=$GRAYLOG_INSTALL_DIR/lib/sigar -Xms1g -Xmx1g -XX:NewRatio=1 -server -XX:+ResizeTLAB -XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled -XX:+CMSClassUnloadingEnabled -XX:+UseParNewGC -XX:-OmitStackTraceInFastThrow" - -# Please adjust according to your bind address -rc_need="net.lo" diff --git a/app-admin/graylog2/files/initd-r2 b/app-admin/graylog2/files/initd-r2 deleted file mode 100644 index c6177eef41d0..000000000000 --- a/app-admin/graylog2/files/initd-r2 +++ /dev/null @@ -1,31 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command="/usr/bin/java" -command_args="${JAVA_OPTS} -jar ${GRAYLOG_INSTALL_DIR}/graylog.jar server -f ${GRAYLOG_CONFIG_FILE} --no-pid-file ${GRAYLOG_OPTIONS}" -command_background="true" -command_user="${GRAYLOG_USER}:${GRAYLOG_GROUP}" -pidfile="/run/${RC_SVCNAME}.pid" - -output_log="${GRAYLOG_LOG_DIR}/graylog.stdout.log" -error_log="${GRAYLOG_LOG_DIR}/graylog.stderr.log" -directory="${GRAYLOG_INSTALL_DIR}" -required_files="${GRAYLOG_CONFIG_FILE}" - -depend() { - use dns -} - -start_pre() { - local d - for d in \ - "${GRAYLOG_DATA_DIR}" \ - "${GRAYLOG_DATA_DIR}/data" \ - "${GRAYLOG_DATA_DIR}/data/contentpacks" \ - "${GRAYLOG_DATA_DIR}/data/journal" \ - "${GRAYLOG_LOG_DIR}"; do - - checkpath -d -o "${GRAYLOG_USER}":"${GRAYLOG_GROUP}" -m750 "${d}" - done -} diff --git a/app-admin/graylog2/graylog2-2.5.1.ebuild b/app-admin/graylog2/graylog2-2.5.1.ebuild deleted file mode 100644 index b045b60179ec..000000000000 --- a/app-admin/graylog2/graylog2-2.5.1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit user - -DESCRIPTION="Free and open source log management" -HOMEPAGE="https://www.graylog.org" -SRC_URI="https://packages.graylog2.org/releases/graylog/graylog-${PV}.tgz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -RESTRICT="strip" - -RDEPEND="virtual/jdk:1.8" - -DOCS=( - COPYING README.markdown UPGRADING.rst -) - -GRAYLOG_DATA_DIR="/var/lib/graylog2" -GRAYLOG_INSTALL_DIR="/usr/share/graylog2" -QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*" - -S="${WORKDIR}/graylog-${PV}" - -pkg_setup() { - enewgroup graylog - enewuser graylog -1 -1 -1 graylog -} - -src_prepare() { - default - - # Stick to architecture of build host - if ! use amd64; then - rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries" - fi - if ! use ppc64; then - rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries" - fi - if ! use x86; then - rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries" - fi - # Currently unsupported platforms - # QA warning galore but testing/patches welcome - rm lib/sigar/libsigar-*freebsd*so \ - lib/sigar/libsigar-*solaris*so \ - lib/sigar/libsigar-*hpux*.sl \ - lib/sigar/libsigar-*macosx*.dylib \ - lib/sigar/libsigar-ia64-*.so \ - lib/sigar/libsigar-ppc-*.so \ - lib/sigar/libsigar-s390x*.so \ - lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries" - - # gentoo specific paths - sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \ - s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g; \ - s@#\(content_packs_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/contentpacks@g" \ - graylog.conf.example || die -} - -src_install() { - default - - insinto /etc/graylog2 - doins graylog.conf.example - - insinto "${GRAYLOG_DATA_DIR}/data/contentpacks" - doins data/contentpacks/grok-patterns.json - - insinto "${GRAYLOG_INSTALL_DIR}" - doins graylog.jar - doins -r lib plugin - - newconfd "${FILESDIR}/confd-r2" graylog2 - newinitd "${FILESDIR}/initd-r2" graylog2 -} - -pkg_postinst() { - ewarn "Graylog does not depend on need.net any more (#439092)." - ewarn - ewarn "Please configure rc_need according to your binding address in:" - ewarn "/etc/conf.d/graylog2" -} diff --git a/app-admin/graylog2/metadata.xml b/app-admin/graylog2/metadata.xml deleted file mode 100644 index 5087760546f6..000000000000 --- a/app-admin/graylog2/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - chainsaw@gentoo.org - Tony Vroon - - diff --git a/profiles/updates/4Q-2019 b/profiles/updates/4Q-2019 index 1bc84ad68a95..7a98f920e248 100644 --- a/profiles/updates/4Q-2019 +++ b/profiles/updates/4Q-2019 @@ -1,3 +1,4 @@ move dev-libs/rlottie media-libs/rlottie move dev-util/repo dev-vcs/repo move media-video/gnome-mpv media-video/celluloid +move app-admin/graylog2 app-admin/graylog -- cgit v1.2.3-65-gdbad