From abaa75b10f899ada8dd05b23cc03205064394bc6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Jan 2021 20:28:19 +0000 Subject: gentoo resync : 22.01.2021 --- .../files/3.5.8-use-system-libs.patch | 63 ------------------- .../files/aerospike.conf | 70 --------------------- .../files/aerospike.init | 53 ---------------- .../files/aerospike.logrotate | 10 --- .../files/aerospike_mesh.conf | 73 ---------------------- .../files/aerospike_ssd.conf | 68 -------------------- 6 files changed, 337 deletions(-) delete mode 100644 dev-db/aerospike-server-community/files/3.5.8-use-system-libs.patch delete mode 100644 dev-db/aerospike-server-community/files/aerospike.conf delete mode 100644 dev-db/aerospike-server-community/files/aerospike.init delete mode 100644 dev-db/aerospike-server-community/files/aerospike.logrotate delete mode 100644 dev-db/aerospike-server-community/files/aerospike_mesh.conf delete mode 100644 dev-db/aerospike-server-community/files/aerospike_ssd.conf (limited to 'dev-db/aerospike-server-community/files') diff --git a/dev-db/aerospike-server-community/files/3.5.8-use-system-libs.patch b/dev-db/aerospike-server-community/files/3.5.8-use-system-libs.patch deleted file mode 100644 index eb69f5ff2e51..000000000000 --- a/dev-db/aerospike-server-community/files/3.5.8-use-system-libs.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/Makefile b/Makefile -index d4ce8ac..26271fd 100644 ---- a/Makefile -+++ b/Makefile -@@ -54,12 +54,16 @@ ifeq ($(USE_ASM),1) - $(MAKE) -C $(ASMALLOC) jem SRCDIR=src - endif - ifeq ($(USE_JEM),1) -+ifeq ($(USE_SYSTEM_JEM),0) - $(MAKE) -C $(JEMALLOC) - endif -+endif - ifeq ($(USE_LUAJIT),1) - $(MAKE) -C $(LUAJIT) Q= TARGET_SONAME=libluajit.so CCDEBUG=-g - endif -+ifeq ($(USE_SYSTEM_JANSSON),0) - $(MAKE) -C $(JANSSON) -+endif - $(MAKE) -C $(COMMON) CF=$(CF) EXT_CFLAGS="$(EXT_CFLAGS)" - $(MAKE) -C $(CF) - $(MAKE) -C $(MOD_LUA) CF=$(CF) COMMON=$(COMMON) LUA_CORE=$(LUA_CORE) EXT_CFLAGS="$(EXT_CFLAGS)" USE_LUAJIT=$(USE_LUAJIT) LUAJIT=$(LUAJIT) -@@ -174,16 +178,24 @@ mexp2: mexp1 - $(MAKE) MEXP_PHASE=2 SRCDIR=$(realpath $(MEXP_DIR))/ - - $(JANSSON)/configure: -+ifeq ($(USE_SYSTEM_JANSSON),0) - cd $(JANSSON) && autoreconf -i -+endif - - $(JANSSON)/Makefile: $(JANSSON)/configure -+ifeq ($(USE_SYSTEM_JANSSON),0) - cd $(JANSSON) && ./configure $(JANSSON_CONFIG_OPT) -+endif - - $(JEMALLOC)/configure: -+ifeq ($(USE_SYSTEM_JEM),0) - cd $(JEMALLOC) && autoconf -+endif - - $(JEMALLOC)/Makefile: $(JEMALLOC)/configure -+ifeq ($(USE_SYSTEM_JEM),0) - cd $(JEMALLOC) && ./configure $(JEM_CONFIG_OPT) -+endif - - $(LUAJIT)/src/luaconf.h: $(LUAJIT)/src/luaconf.h.orig - ln -s $(notdir $<) $@ -diff --git a/make_in/Makefile.vars b/make_in/Makefile.vars -index efe3226..0b54701 100644 ---- a/make_in/Makefile.vars -+++ b/make_in/Makefile.vars -@@ -31,6 +31,12 @@ ifeq ($(USE_ASM),1) - EXT_CFLAGS += -DUSE_ASM - endif - -+# Use the system provided JEMalloc memory allocator? [By default, no.] -+USE_SYSTEM_JEM = 0 -+ -+# Use the system provided Jansson JSON API Library? [By default, no.] -+USE_SYSTEM_JANSSON = 0 -+ - # Use the JEMalloc memory allocator? [By default, yes.] - USE_JEM = 1 - diff --git a/dev-db/aerospike-server-community/files/aerospike.conf b/dev-db/aerospike-server-community/files/aerospike.conf deleted file mode 100644 index 842873bd3e8e..000000000000 --- a/dev-db/aerospike-server-community/files/aerospike.conf +++ /dev/null @@ -1,70 +0,0 @@ -# Aerospike database configuration file. - -service { - user root - group root - paxos-single-replica-limit 1 # Number of nodes where the replica count is automatically reduced to 1. - pidfile /run/aerospike/aerospike.pid - service-threads 4 - transaction-queues 4 - transaction-threads-per-queue 4 - proto-fd-max 15000 -} - -logging { - # Log file must be an absolute path. - file /var/log/aerospike/aerospike.log { - context any info - } -} - -network { - service { - address any - port 3000 - } - - heartbeat { - mode multicast - address 239.1.99.222 - port 9918 - - # To use unicast-mesh heartbeats, remove the 3 lines above, and see - # aerospike_mesh.conf for alternative. - - interval 150 - timeout 10 - } - - fabric { - port 3001 - } - - info { - port 3003 - } -} - -namespace test { - replication-factor 2 - memory-size 4G - default-ttl 30d # 30 days, use 0 to never expire/evict. - - storage-engine memory -} - -namespace bar { - replication-factor 2 - memory-size 4G - default-ttl 30d # 30 days, use 0 to never expire/evict. - - storage-engine memory - - # To use file storage backing, comment out the line above and use the - # following lines instead. -# storage-engine device { -# file /opt/aerospike/data/bar.dat -# filesize 16G -# data-in-memory true # Store data in memory in addition to file. -# } -} diff --git a/dev-db/aerospike-server-community/files/aerospike.init b/dev-db/aerospike-server-community/files/aerospike.init deleted file mode 100644 index b1dac8078d6d..000000000000 --- a/dev-db/aerospike-server-community/files/aerospike.init +++ /dev/null @@ -1,53 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -config_file=${config_file:-/etc/aerospike/${SVCNAME}.conf} -run_dir=${run_dir:-/run/aerospike} - -command="/usr/bin/asd" -command_args="--config-file ${config_file}" -command_background="false" -pidfile=${run_dir}/${SVCNAME}.pid -user=${user:-aerospike} -group=${group:-aerospike} -start_stop_daemon_args="--user ${user} --group ${group}" -required_files="${config_file}" - -depend() { - use net -} - -set_shmall() { - mem=`/sbin/sysctl -n kernel.shmall` - min=4294967296 - if [ ${#mem} -le ${#min} ]; then - if [ $mem -lt $min ]; then - ewarn "kernel.shmall too low, setting to 4G pages = 16TB" - /sbin/sysctl -w kernel.shmall=$min - fi - fi -} - -set_shmmax() { - mem=`/sbin/sysctl -n kernel.shmmax` - min=1073741824 - if [ ${#mem} -le ${#min} ]; then - if [ $mem -lt $min ]; then - ewarn "kernel.shmmax too low, setting to 1GB" - /sbin/sysctl -w kernel.shmmax=$min - fi - fi -} - -start_pre() { - checkpath -d -m 0755 -o "${user}":"${group}" "${run_dir}" - set_shmall - set_shmmax - ulimit -n 100000 - if [ -n $LD_PRELOAD ]; then export LD_PRELOAD; fi -} - -start_post() { - ewaitfile 60 "${pidfile}" -} diff --git a/dev-db/aerospike-server-community/files/aerospike.logrotate b/dev-db/aerospike-server-community/files/aerospike.logrotate deleted file mode 100644 index 04aabc4a6017..000000000000 --- a/dev-db/aerospike-server-community/files/aerospike.logrotate +++ /dev/null @@ -1,10 +0,0 @@ -/var/log/aerospike/aerospike.log { - daily - rotate 90 - dateext - compress - olddir /var/log/aerospike/ - postrotate - kill -HUP `cat /var/run/aerospike/aerospike.pid` - endscript -} diff --git a/dev-db/aerospike-server-community/files/aerospike_mesh.conf b/dev-db/aerospike-server-community/files/aerospike_mesh.conf deleted file mode 100644 index 26274f310ed0..000000000000 --- a/dev-db/aerospike-server-community/files/aerospike_mesh.conf +++ /dev/null @@ -1,73 +0,0 @@ -# Aerospike database configuration file for deployments using mesh heartbeats. - -service { - user root - group root - paxos-single-replica-limit 1 # Number of nodes where the replica count is automatically reduced to 1. - pidfile /run/aerospike/aerospike.pid - service-threads 4 - transaction-queues 4 - transaction-threads-per-queue 4 - proto-fd-max 15000 -} - -logging { - # Log file must be an absolute path. - file /var/log/aerospike/aerospike.log { - context any info - } -} - -network { - service { - address any - port 3000 - } - - heartbeat { - mode mesh - port 3002 # Heartbeat port for this node. - - # List one or more other nodes, one ip-address & port per line: - mesh-seed-address-port 10.10.10.10 3002 -# mesh-seed-address-port 10.10.10.11 3002 -# mesh-seed-address-port 10.10.10.12 3002 -# mesh-seed-address-port 10.10.10.13 3002 -# mesh-seed-address-port 10.10.10.14 3002 - - interval 250 - timeout 10 - } - - fabric { - port 3001 - } - - info { - port 3003 - } -} - -namespace test { - replication-factor 2 - memory-size 4G - default-ttl 30d # 30 days, use 0 to never expire/evict. - - storage-engine memory -} - -namespace bar { - replication-factor 2 - memory-size 4G - default-ttl 30d # 30 days, use 0 to never expire/evict. - - storage-engine memory - - # To use file storage backing, comment out the line above and use the - # following lines instead. -# storage-engine device { -# file /opt/aerospike/data/bar.dat -# filesize 16G -# data-in-memory true # Store data in memory in addition to file. -# } -} diff --git a/dev-db/aerospike-server-community/files/aerospike_ssd.conf b/dev-db/aerospike-server-community/files/aerospike_ssd.conf deleted file mode 100644 index 3d75bd6f7d91..000000000000 --- a/dev-db/aerospike-server-community/files/aerospike_ssd.conf +++ /dev/null @@ -1,68 +0,0 @@ -# Aerospike database configuration file for deployments using raw storage. - -service { - user root - group root - paxos-single-replica-limit 1 # Number of nodes where the replica count is automatically reduced to 1. - pidfile /run/aerospike/aerospike.pid - service-threads 8 - transaction-queues 8 - transaction-threads-per-queue 8 - proto-fd-max 15000 -} - -logging { - # Log file must be an absolute path. - file /var/log/aerospike/aerospike.log { - context any info - } -} - -network { - service { - address any - port 3000 - } - - heartbeat { - mode multicast - address 239.1.99.222 - port 9918 - - # To use unicast-mesh heartbeats, remove the 3 lines above, and see - # aerospike_mesh.conf for alternative. - - interval 150 - timeout 10 - } - - fabric { - port 3001 - } - - info { - port 3003 - } -} - -namespace test { - replication-factor 2 - memory-size 4G - default-ttl 30d # 30 days, use 0 to never expire/evict. - - # Warning - legacy data in defined raw partition devices will be erased. - # These partitions must not be mounted by the file system. - storage-engine device { - # Use one or more lines like those below with actual device paths. -# device /dev/sdb -# device /dev/sdc - - # The 2 lines below optimize for SSD. - scheduler-mode noop - write-block-size 128K - - # Use the line below to store data in memory in addition to devices. -# data-in-memory true - } -} - -- cgit v1.2.3