[gentoo-commits] repo/gentoo:master commit in: net-analyzer/prometheus-pushgateway/, app-metrics/pushgateway/files/, ...

[Manuel Rüger]

commit:     476e87a3d843681e868f4e73cb543bbb815691ad
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 30 17:05:52 2018 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 17:05:52 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=476e87a3

app-metrics/pushgateway: Move package from net-analyzer/prometheus-pushgateway

 app-metrics/pushgateway/Manifest                                   | 1 +
 .../pushgateway/files/pushgateway.confd                            | 0
 .../pushgateway/files/pushgateway.initd                            | 0
 app-metrics/pushgateway/files/pushgateway.logrotated               | 7 +++++++
 .../pushgateway/files/pushgateway.service                          | 4 ++--
 .../pushgateway}/metadata.xml                                      | 0
 .../pushgateway/pushgateway-0.4.0.ebuild                           | 4 ++--
 net-analyzer/prometheus-pushgateway/Manifest                       | 1 -
 .../prometheus-pushgateway/files/prometheus-pushgateway.logrotated | 7 -------
 profiles/updates/1Q-2018                                           | 1 +
 10 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app-metrics/pushgateway/Manifest b/app-metrics/pushgateway/Manifest
new file mode 100644
index 00000000000..6d857bd20ce
--- /dev/null
+++ b/app-metrics/pushgateway/Manifest
@@ -0,0 +1 @@
+DIST pushgateway-0.4.0.tar.gz 1140644 BLAKE2B ea82e2e7f6fd817de02044e5aafde724a4089e4f2961f0b581f90df7e04e65af5a3c3e044ef94bd600a92468a8aed791c838a8fdc64b05b7a91d6288e7e96fb3 SHA512 67f25e5f7fdc54143c5d10720f27bd256f22695ced93088cf2b72fe3197e45324d4353357ae40d7d3e92019480c0bec009e38ed3f583724d46411d76adbdc927

diff --git a/net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.confd b/app-metrics/pushgateway/files/pushgateway.confd
similarity index 100%
rename from net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.confd
rename to app-metrics/pushgateway/files/pushgateway.confd

diff --git a/net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.initd b/app-metrics/pushgateway/files/pushgateway.initd
similarity index 100%
rename from net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.initd
rename to app-metrics/pushgateway/files/pushgateway.initd

diff --git a/app-metrics/pushgateway/files/pushgateway.logrotated b/app-metrics/pushgateway/files/pushgateway.logrotated
new file mode 100644
index 00000000000..c94b73952bc
--- /dev/null
+++ b/app-metrics/pushgateway/files/pushgateway.logrotated
@@ -0,0 +1,7 @@
+/var/log/pushgateway/pushgateway.log {
+	missingok
+	size 5M
+	rotate 3
+	compress
+	copytruncate
+}

diff --git a/net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.service b/app-metrics/pushgateway/files/pushgateway.service
similarity index 80%
rename from net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.service
rename to app-metrics/pushgateway/files/pushgateway.service
index 4377850f2c5..3915fdb5b33 100644
--- a/net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.service
+++ b/app-metrics/pushgateway/files/pushgateway.service
@@ -4,9 +4,9 @@ Documentation=https://prometheus.io/docs/instrumenting/pushing/
 After=network-online.target
 
 [Service]
-User=prometheus-pushgateway
+User=pushgateway
 Restart=on-failure
-Environment=PUSHGATEWAY_ARGS="-web.listen-address localhost:9091 --persistence.file=/var/lib/prometheus-pushgateway/persistence.gob"
+Environment=PUSHGATEWAY_ARGS="-web.listen-address localhost:9091 --persistence.file=/var/lib/pushgateway/persistence.gob"
 ExecStart=/usr/bin/pushgateway $PUSHGATEWAY_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 TimeoutStopSec=20s

diff --git a/net-analyzer/prometheus-pushgateway/metadata.xml b/app-metrics/pushgateway/metadata.xml
similarity index 100%
rename from net-analyzer/prometheus-pushgateway/metadata.xml
rename to app-metrics/pushgateway/metadata.xml

diff --git a/net-analyzer/prometheus-pushgateway/prometheus-pushgateway-0.4.0.ebuild b/app-metrics/pushgateway/pushgateway-0.4.0.ebuild
similarity index 93%
rename from net-analyzer/prometheus-pushgateway/prometheus-pushgateway-0.4.0.ebuild
rename to app-metrics/pushgateway/pushgateway-0.4.0.ebuild
index 848c8d3c334..c701fc15d86 100644
--- a/net-analyzer/prometheus-pushgateway/prometheus-pushgateway-0.4.0.ebuild
+++ b/app-metrics/pushgateway/pushgateway-0.4.0.ebuild
@@ -32,13 +32,13 @@ src_prepare() {
 src_compile() {
 	pushd src/${EGO_PN} || die
 	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix pushgateway || die
+	GOPATH="${S}" promu build -v --prefix bin || die
 	popd || die
 }
 
 src_install() {
 	pushd src/${EGO_PN} || die
-	dobin pushgateway/pushgateway
+	dobin bin/pushgateway
 	dodoc {README,CHANGELOG,CONTRIBUTING}.md
 	popd || die
 	keepdir /var/lib/${PN} /var/log/${PN}

diff --git a/net-analyzer/prometheus-pushgateway/Manifest b/net-analyzer/prometheus-pushgateway/Manifest
deleted file mode 100644
index 8006b32ae23..00000000000
--- a/net-analyzer/prometheus-pushgateway/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST prometheus-pushgateway-0.4.0.tar.gz 1140644 BLAKE2B ea82e2e7f6fd817de02044e5aafde724a4089e4f2961f0b581f90df7e04e65af5a3c3e044ef94bd600a92468a8aed791c838a8fdc64b05b7a91d6288e7e96fb3 SHA512 67f25e5f7fdc54143c5d10720f27bd256f22695ced93088cf2b72fe3197e45324d4353357ae40d7d3e92019480c0bec009e38ed3f583724d46411d76adbdc927

diff --git a/net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.logrotated b/net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.logrotated
deleted file mode 100644
index 3645c9be176..00000000000
--- a/net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.logrotated
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/prometheus-pushgateway/prometheus-pushgateway.log {
-	missingok
-	size 5M
-	rotate 3
-	compress
-	copytruncate
-}

diff --git a/profiles/updates/1Q-2018 b/profiles/updates/1Q-2018
index bbb63fd0dc4..903ea63ca17 100644
--- a/profiles/updates/1Q-2018
+++ b/profiles/updates/1Q-2018
@@ -20,3 +20,4 @@ move net-analyzer/prometheus-blackbox_exporter app-metrics/blackbox_exporter
 move net-analyzer/prometheus-snmp_exporter app-metrics/snmp_exporter
 move net-analyzer/prometheus-redis_exporter app-metrics/redis_exporter
 move net-analyzer/prometheus-uwsgi_exporter app-metrics/uwsgi_exporter
+move net-analyzer/prometheus-pushgateway app-metrics/pushgateway