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

10 files changed, 12 insertions, 11 deletions

diff --git a/app-metrics/uwsgi_exporter/Manifest b/app-metrics/uwsgi_exporter/Manifest
new file mode 100644
index 000000000000..b4a5124da24d
--- /dev/null
+++ b/app-metrics/uwsgi_exporter/Manifest
@@ -0,0 +1 @@
+DIST uwsgi_exporter-0.7.0.tar.gz 3039893 BLAKE2B a6efdae7f9a19ad21a283b586b5667bd99456274ed419d1b64aaf4cdb4df1e1c4fb2a08edf6df2b15813d21311fe54c2f2394f0bf25ac11c49db8a924596da05 SHA512 380ef4515eaa81d4dee853682efa7a5e82af2ec00c096e7471028c9932d46e0a7406b75cb40f0f8efec15cd77b06c5477a07919d0b44720e3e194b5bb023b593
diff --git a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.confd b/app-metrics/uwsgi_exporter/files/uwsgi_exporter.confd
index 6db54fb3cc0e..6db54fb3cc0e 100644
--- a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.confd
+++ b/app-metrics/uwsgi_exporter/files/uwsgi_exporter.confd
diff --git a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.initd b/app-metrics/uwsgi_exporter/files/uwsgi_exporter.initd
index b456a0b10505..b456a0b10505 100644
--- a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.initd
+++ b/app-metrics/uwsgi_exporter/files/uwsgi_exporter.initd
diff --git a/app-metrics/uwsgi_exporter/files/uwsgi_exporter.logrotated b/app-metrics/uwsgi_exporter/files/uwsgi_exporter.logrotated
new file mode 100644
index 000000000000..ea6820d6ca4a
--- /dev/null
+++ b/app-metrics/uwsgi_exporter/files/uwsgi_exporter.logrotated
@@ -0,0 +1,7 @@
+/var/log/uwsgi_exporter/uwsgi_exporter.log {
+	missingok
+	size 5M
+	rotate 3
+	compress
+	copytruncate
+}
diff --git a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.service b/app-metrics/uwsgi_exporter/files/uwsgi_exporter.service
index 39824c7efe7e..229a1f397fe5 100644
--- a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.service
+++ b/app-metrics/uwsgi_exporter/files/uwsgi_exporter.service
@@ -4,7 +4,7 @@ Documentation=https://github.com/timonwong/uwsgi_exporter/
 After=network-online.target
 
 [Service]
-User=prometheus-uwsgi_exporter
+User=uwsgi_exporter
 Restart=on-failure
 Environment=UWSGI_EXPORTER_ARGS="--web.listen-address=:9117 --stats.uri=http://localhost:1717"
 ExecStart=/usr/bin/uwsgi_exporter $UWSGI_EXPORTER_ARGS
diff --git a/net-analyzer/prometheus-uwsgi_exporter/metadata.xml b/app-metrics/uwsgi_exporter/metadata.xml
index ba98a1a69cd7..ba98a1a69cd7 100644
--- a/net-analyzer/prometheus-uwsgi_exporter/metadata.xml
+++ b/app-metrics/uwsgi_exporter/metadata.xml
diff --git a/net-analyzer/prometheus-uwsgi_exporter/prometheus-uwsgi_exporter-0.7.0.ebuild b/app-metrics/uwsgi_exporter/uwsgi_exporter-0.7.0.ebuild
index 26946cce453c..7c5dd6280d85 100644
--- a/net-analyzer/prometheus-uwsgi_exporter/prometheus-uwsgi_exporter-0.7.0.ebuild
+++ b/app-metrics/uwsgi_exporter/uwsgi_exporter-0.7.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 uwsgi_exporter || die
+	GOPATH="${S}" promu build -v --prefix bin || die
 	popd || die
 }
 
 src_install() {
 	pushd src/${EGO_PN} || die
-	dobin uwsgi_exporter/uwsgi_exporter
+	dobin bin/uwsgi_exporter
 	dodoc README.md
 	popd || die
 	local dir
diff --git a/net-analyzer/prometheus-uwsgi_exporter/Manifest b/net-analyzer/prometheus-uwsgi_exporter/Manifest
deleted file mode 100644
index 63942cda2bb2..000000000000
--- a/net-analyzer/prometheus-uwsgi_exporter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST prometheus-uwsgi_exporter-0.7.0.tar.gz 3039893 BLAKE2B a6efdae7f9a19ad21a283b586b5667bd99456274ed419d1b64aaf4cdb4df1e1c4fb2a08edf6df2b15813d21311fe54c2f2394f0bf25ac11c49db8a924596da05 SHA512 380ef4515eaa81d4dee853682efa7a5e82af2ec00c096e7471028c9932d46e0a7406b75cb40f0f8efec15cd77b06c5477a07919d0b44720e3e194b5bb023b593
diff --git a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.logrotated b/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.logrotated
deleted file mode 100644
index 8703cb2be385..000000000000
--- a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.logrotated
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/prometheus-uwsgi_exporter/prometheus-uwsgi_exporter.log {
-	missingok
-	size 5M
-	rotate 3
-	compress
-	copytruncate
-}
diff --git a/profiles/updates/1Q-2018 b/profiles/updates/1Q-2018
index 6e3ec5132035..bbb63fd0dc44 100644
--- a/profiles/updates/1Q-2018
+++ b/profiles/updates/1Q-2018
@@ -19,3 +19,4 @@ move net-analyzer/prometheus-node_exporter app-metrics/node_exporter
 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