1 |
commit: ce0c1b6e6b09eaefa401b7f2a19a6f3640f281a4 |
2 |
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Feb 21 09:28:40 2017 +0000 |
4 |
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 2 05:28:50 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce0c1b6e |
7 |
|
8 |
app-misc/elasticsearch: bump to 2.4.4/5.1.2 |
9 |
|
10 |
Package-Manager: portage-2.3.3 |
11 |
|
12 |
app-misc/elasticsearch/Manifest | 4 +- |
13 |
...rch-2.4.3.ebuild => elasticsearch-2.4.4.ebuild} | 1 - |
14 |
...rch-5.1.1.ebuild => elasticsearch-5.1.2.ebuild} | 2 +- |
15 |
app-misc/elasticsearch/files/elasticsearch.init6 | 1 + |
16 |
.../elasticsearch/files/elasticsearch.service6 | 53 ++++++++++++++++++++++ |
17 |
5 files changed, 57 insertions(+), 4 deletions(-) |
18 |
|
19 |
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest |
20 |
index 2f1dc70955a..f12537168d8 100644 |
21 |
--- a/app-misc/elasticsearch/Manifest |
22 |
+++ b/app-misc/elasticsearch/Manifest |
23 |
@@ -1,2 +1,2 @@ |
24 |
-DIST elasticsearch-2.4.3.tar.gz 27342693 SHA256 01eb684943be01d4af3131c6795073187b1a5868b6525d9686cc0d7a315db12e SHA512 357a145050ba155d60239f0127e8b772705efcddc9246492d80792c65c613f82a87dd4e4ea4a36c9555a0b5a536a34e2168d57c5b851c36f042f9a52ab3e24a8 WHIRLPOOL 07cd05120ac3bb15cd65b29caca6cc847f0e21cae7ff9a1d1002bcb66a54334c85cfc739e05d8452ba128fb3bdecb6c6cc4726e498f4c9e4e7cb8995c7ea7c2b |
25 |
-DIST elasticsearch-5.1.1.tar.gz 33291322 SHA256 cd45bafb1f74a7df9bad12c77b7bf3080069266bcbe0b256b0959ef2536e31e8 SHA512 2b5faf97c5ff41a9f12e21749d60f3632b39987d4886713ee9646110acdd17323d263168980d7dd4035732556b604acd68dc37ae7b805d84493075776b9d7bcd WHIRLPOOL ebb46d4a5643f09c0c903055c407a54d46264347924ca37cc73adfee3dd8a9bf2157b1be92b9b1d85636ea92b2d1f89d558c5413c804412996ea9bce42f1c3c6 |
26 |
+DIST elasticsearch-2.4.4.tar.gz 27343272 SHA256 981092e6ca65ba5560b8b97a74e5ed0eb2236e9128efdb85bb652cec340158e2 SHA512 899a4d2fc64548bcd488ece223f5f189dfb191eceb36390c4b9d8d0d90ef9d2cb67ada475223b9b2e0bd0fb521a4ab978bc7f60781195927e36d027925338c14 WHIRLPOOL 1a90bb8c923a9eab6cc4390b3daaa44cd85d5c1a3a1a5ef7d274050eb25b061a11a91b0f57ebe9f3cb27aafee3267af8f63ca87837f79d622ff362fbc5b6ae1a |
27 |
+DIST elasticsearch-5.1.2.tar.gz 33299777 SHA256 74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42 SHA512 1867626e8a87f11ed109e1325fd1d16c9e0af06ebe6a30c78ea679ab533ab377f5da8ea55af6871be33af226f02187a2aadd77e5e23c097dd24055be21e9d691 WHIRLPOOL 2e9df71c915343e2cc8ad82c59b877f41f5e093cbeba21f471c32cb51a195eccc6223bc48da48bb4af2e6bea9f2539f2e93b866963148f4ca2940ba4466e614e |
28 |
|
29 |
diff --git a/app-misc/elasticsearch/elasticsearch-2.4.3.ebuild b/app-misc/elasticsearch/elasticsearch-2.4.4.ebuild |
30 |
similarity index 98% |
31 |
rename from app-misc/elasticsearch/elasticsearch-2.4.3.ebuild |
32 |
rename to app-misc/elasticsearch/elasticsearch-2.4.4.ebuild |
33 |
index 57a8b23eb59..f3901ac933b 100644 |
34 |
--- a/app-misc/elasticsearch/elasticsearch-2.4.3.ebuild |
35 |
+++ b/app-misc/elasticsearch/elasticsearch-2.4.4.ebuild |
36 |
@@ -36,7 +36,6 @@ src_prepare() { |
37 |
|
38 |
src_install() { |
39 |
keepdir /etc/${PN} |
40 |
- dodir /etc/${PN}/scripts |
41 |
|
42 |
insinto /etc/${PN} |
43 |
doins config/* |
44 |
|
45 |
diff --git a/app-misc/elasticsearch/elasticsearch-5.1.1.ebuild b/app-misc/elasticsearch/elasticsearch-5.1.2.ebuild |
46 |
similarity index 96% |
47 |
rename from app-misc/elasticsearch/elasticsearch-5.1.1.ebuild |
48 |
rename to app-misc/elasticsearch/elasticsearch-5.1.2.ebuild |
49 |
index 45059715f60..1d57516b9fa 100644 |
50 |
--- a/app-misc/elasticsearch/elasticsearch-5.1.1.ebuild |
51 |
+++ b/app-misc/elasticsearch/elasticsearch-5.1.2.ebuild |
52 |
@@ -60,7 +60,7 @@ src_install() { |
53 |
|
54 |
newinitd "${FILESDIR}/${PN}.init7" "${PN}" |
55 |
newconfd "${FILESDIR}/${PN}.conf3" "${PN}" |
56 |
- systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service" |
57 |
+ systemd_newunit "${FILESDIR}"/${PN}.service6 "${PN}.service" |
58 |
} |
59 |
|
60 |
pkg_postinst() { |
61 |
|
62 |
diff --git a/app-misc/elasticsearch/files/elasticsearch.init6 b/app-misc/elasticsearch/files/elasticsearch.init6 |
63 |
index 9b11ed61db9..e3252c55c67 100644 |
64 |
--- a/app-misc/elasticsearch/files/elasticsearch.init6 |
65 |
+++ b/app-misc/elasticsearch/files/elasticsearch.init6 |
66 |
@@ -82,6 +82,7 @@ start() { |
67 |
checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${PID_DIR}" |
68 |
checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}" |
69 |
checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}" |
70 |
+ checkpath -d -o root:root -m755 "${CONF_DIR}/scripts" |
71 |
|
72 |
start-stop-daemon --start \ |
73 |
--background \ |
74 |
|
75 |
diff --git a/app-misc/elasticsearch/files/elasticsearch.service6 b/app-misc/elasticsearch/files/elasticsearch.service6 |
76 |
new file mode 100644 |
77 |
index 00000000000..927acef5ee8 |
78 |
--- /dev/null |
79 |
+++ b/app-misc/elasticsearch/files/elasticsearch.service6 |
80 |
@@ -0,0 +1,53 @@ |
81 |
+[Unit] |
82 |
+Description=Elasticsearch |
83 |
+Documentation=http://www.elastic.co |
84 |
+Wants=network.target |
85 |
+After=network.target |
86 |
+ |
87 |
+[Service] |
88 |
+Environment=ES_HOME=/usr/share/elasticsearch |
89 |
+Environment=CONF_DIR=/etc/elasticsearch |
90 |
+Environment=DATA_DIR=/var/lib/elasticsearch |
91 |
+Environment=LOG_DIR=/var/log/elasticsearch |
92 |
+Environment=PID_DIR=/run/elasticsearch |
93 |
+EnvironmentFile=-/etc/conf.d/elasticsearch |
94 |
+ |
95 |
+WorkingDirectory=/usr/share/elasticsearch |
96 |
+ |
97 |
+User=elasticsearch |
98 |
+Group=elasticsearch |
99 |
+ |
100 |
+ExecStartPre=/usr/share/elasticsearch/bin/elasticsearch-systemd-pre-exec |
101 |
+ |
102 |
+ExecStart=/usr/share/elasticsearch/bin/elasticsearch \ |
103 |
+ -p ${PID_DIR}/elasticsearch.pid \ |
104 |
+ -Edefault.path.home=${ES_HOME} \ |
105 |
+ -Edefault.path.logs=${LOG_DIR} \ |
106 |
+ -Edefault.path.data=${DATA_DIR} \ |
107 |
+ -Edefault.path.conf=${CONF_DIR} |
108 |
+ |
109 |
+StandardOutput=journal |
110 |
+StandardError=inherit |
111 |
+ |
112 |
+# Specifies the maximum file descriptor number that can be opened by this process |
113 |
+LimitNOFILE=65536 |
114 |
+ |
115 |
+# Specifies the maximum number of bytes of memory that may be locked into RAM |
116 |
+# Set to "infinity" if you use the 'bootstrap.memory_lock: true' option |
117 |
+# in elasticsearch.yml and 'MAX_LOCKED_MEMORY=unlimited' in /etc/conf.d/elasticsearch |
118 |
+#LimitMEMLOCK=infinity |
119 |
+ |
120 |
+# Disable timeout logic and wait until process is stopped |
121 |
+TimeoutStopSec=0 |
122 |
+ |
123 |
+# SIGTERM signal is used to stop the Java process |
124 |
+KillSignal=SIGTERM |
125 |
+ |
126 |
+# Java process is never killed |
127 |
+SendSIGKILL=no |
128 |
+ |
129 |
+# When a JVM receives a SIGTERM signal it exits with code 143 |
130 |
+SuccessExitStatus=143 |
131 |
+ |
132 |
+[Install] |
133 |
+WantedBy=multi-user.target |