* [gentoo-commits] repo/proj/guru:master commit in: www-servers/hinsightd/, www-servers/hinsightd/files/
@ 2021-04-19 8:04 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2021-04-19 8:04 UTC (permalink / raw
To: gentoo-commits
commit: 398256d5a7bb8a7717e656587272e271e76c15c7
Author: tiotags <tiotags1 <AT> gmail <DOT> com>
AuthorDate: Mon Apr 19 07:50:00 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Apr 19 07:50:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=398256d5
www-servers/hinsightd: added logrotate script and systemd unit
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alexandru Campeanu <tiotags1 <AT> gmail.com>
www-servers/hinsightd/files/hinsightd.service | 10 ++++++++++
www-servers/hinsightd/files/logrotate.d.sh | 14 ++++++++++++++
www-servers/hinsightd/hinsightd-9999.ebuild | 5 +++++
3 files changed, 29 insertions(+)
diff --git a/www-servers/hinsightd/files/hinsightd.service b/www-servers/hinsightd/files/hinsightd.service
new file mode 100644
index 000000000..02215732e
--- /dev/null
+++ b/www-servers/hinsightd/files/hinsightd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=hinsightd is a http/1.1 webserver
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/bin/hinsightd --config /etc/hinsightd/hinsightd.lua
+ExecReload=/bin/kill -USR1 $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-servers/hinsightd/files/logrotate.d.sh b/www-servers/hinsightd/files/logrotate.d.sh
new file mode 100644
index 000000000..3483c001f
--- /dev/null
+++ b/www-servers/hinsightd/files/logrotate.d.sh
@@ -0,0 +1,14 @@
+/var/log/hinsightd/*.log {
+daily
+missingok
+rotate 7
+compress
+delaycompress
+minsize 1M
+notifempty
+sharedscripts
+postrotate
+ test -e /run/openrc/softlevel && /etc/init.d/hinsightd reload 1>/dev/null || true
+ test -e /run/systemd/system && systemctl reload hinsightd.service || true
+endscript
+}
diff --git a/www-servers/hinsightd/hinsightd-9999.ebuild b/www-servers/hinsightd/hinsightd-9999.ebuild
index fc2323148..bdb8dbee6 100644
--- a/www-servers/hinsightd/hinsightd-9999.ebuild
+++ b/www-servers/hinsightd/hinsightd-9999.ebuild
@@ -45,10 +45,15 @@ src_compile() {
src_install() {
newbin "${S}/build/hin9" hinsightd
newinitd "${FILESDIR}/init.d.sh" hinsightd
+ #systemd_dounit "${FILESDIR}/hinsightd.service" # not tested
insinto /etc/hinsightd
newins "${S}/workdir/main.lua" hinsightd.lua
+ # logrotate
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/logrotate.d.sh hinsightd
+
keepdir /var/www/localhost/htdocs
keepdir /var/log/hinsightd
keepdir /var/tmp/hinsightd
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: www-servers/hinsightd/, www-servers/hinsightd/files/
@ 2021-04-30 9:37 Haelwenn Monnier
0 siblings, 0 replies; 3+ messages in thread
From: Haelwenn Monnier @ 2021-04-30 9:37 UTC (permalink / raw
To: gentoo-commits
commit: 95e29c33c1c2f04ef1515ec4d123f35ffa3ab19c
Author: tiotags <tiotags1 <AT> gmail <DOT> com>
AuthorDate: Fri Apr 30 07:49:08 2021 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Fri Apr 30 07:49:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=95e29c33
www-servers/hinsightd: new version 0.9.3
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alexandru Campeanu <tiotags1 <AT> gmail.com>
www-servers/hinsightd/Manifest | 2 +-
.../hinsightd/files/hinsightd-redefine-directories.patch | 12 +++++++-----
.../{hinsightd-0.9.2.ebuild => hinsightd-0.9.3.ebuild} | 0
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest
index bd726cf85..a3034ae29 100644
--- a/www-servers/hinsightd/Manifest
+++ b/www-servers/hinsightd/Manifest
@@ -1 +1 @@
-DIST hin9-v0.9.2.tar.gz 65277 BLAKE2B 64f68db310ddd9438bd2b0247a285a9f7c4b162bfb105802760e4a231693116d159aaa4052d9c596356a2a6768379033b0bc1334a4da9ec9c845a1c835965922 SHA512 1ce3fd028e32be3daabf0b743c1005e9670df4f704c862aa871418dcb877d1780c174ae1c054be06bea62600e573a9ef80e67e4759c6722f9e25f3d656faa431
+DIST hin9-v0.9.3.tar.gz 65343 BLAKE2B 4b475f8088aa113ae7dbd2cfe091ee10efb39d60b7277cb821eb010e752b39adf5e2a3c53aedc73c612ed4ba3d96178c09f255b9a07caf64b9cad34af2da5841 SHA512 768f0e55c2992b0ce50187a62e4c75ae2c2e2c31067d77898d221ad89afba20a3121853f01267bf6f1e43942ddca273bfed6c63849ce922c9c9d2c971a9061e0
diff --git a/www-servers/hinsightd/files/hinsightd-redefine-directories.patch b/www-servers/hinsightd/files/hinsightd-redefine-directories.patch
index c204eff35..9fa2285a8 100644
--- a/www-servers/hinsightd/files/hinsightd-redefine-directories.patch
+++ b/www-servers/hinsightd/files/hinsightd-redefine-directories.patch
@@ -1,21 +1,23 @@
diff --git a/src/hin/conf.h b/src/hin/conf.h
-index c4f7f4c..23b0714 100644
+index 8dfe060..3874d6c 100644
--- a/src/hin/conf.h
+++ b/src/hin/conf.h
-@@ -2,9 +2,9 @@
+@@ -2,10 +2,10 @@
#ifndef HIN_CONF_H
#define HIN_CONF_H
-#define HIN_CONF_PATH "workdir/main.lua"
-#define HIN_LOGDIR_PATH "build/"
--#define HIN_CWD_PATH "./"
+-#define HIN_WORKDIR_PATH "./"
+-#define HIN_PRINT_GREETING 1
+#define HIN_CONF_PATH "/etc/hinsightd/hinsightd.lua"
+#define HIN_LOGDIR_PATH "/var/log/hinsightd/"
-+#define HIN_CWD_PATH "/var/www/localhost/"
++#define HIN_WORKDIR_PATH "/var/www/localhost/"
++#define HIN_PRINT_GREETING 0
#define HIN_URING_QUEUE_DEPTH 256
#define HIN_URING_DONT_FORK 0
-@@ -20,8 +20,8 @@
+@@ -21,8 +21,8 @@
#define HIN_HTTPD_MAX_HEADER_LINE_SIZE 4096
#define HIN_HTTPD_MAX_POST_SIZE 4121440
#define HIN_HTTPD_MAX_DEFLATE_SIZE 0
diff --git a/www-servers/hinsightd/hinsightd-0.9.2.ebuild b/www-servers/hinsightd/hinsightd-0.9.3.ebuild
similarity index 100%
rename from www-servers/hinsightd/hinsightd-0.9.2.ebuild
rename to www-servers/hinsightd/hinsightd-0.9.3.ebuild
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: www-servers/hinsightd/, www-servers/hinsightd/files/
@ 2021-06-20 13:07 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2021-06-20 13:07 UTC (permalink / raw
To: gentoo-commits
commit: 35e86e4fb59120ffeeb37a17fbf9bcfffcf5f62e
Author: tiotags <tiotags1 <AT> gmail <DOT> com>
AuthorDate: Sun Jun 20 09:17:24 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jun 20 09:17:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=35e86e4f
www-servers/hinsightd: new version + changes
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexandru Campeanu <tiotags1 <AT> gmail.com>
www-servers/hinsightd/Manifest | 1 +
.../hinsightd/files/hinsightd-defines-v3.patch | 21 +++++++++
www-servers/hinsightd/files/initd-v1.sh | 50 ++++++++++++++++++++++
...insightd-9999.ebuild => hinsightd-0.9.5.ebuild} | 10 ++---
www-servers/hinsightd/hinsightd-9999.ebuild | 10 ++---
5 files changed, 82 insertions(+), 10 deletions(-)
diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest
index 56ef7b385..9bad66830 100644
--- a/www-servers/hinsightd/Manifest
+++ b/www-servers/hinsightd/Manifest
@@ -1,2 +1,3 @@
DIST hin9-v0.9.3.tar.gz 65343 BLAKE2B 4b475f8088aa113ae7dbd2cfe091ee10efb39d60b7277cb821eb010e752b39adf5e2a3c53aedc73c612ed4ba3d96178c09f255b9a07caf64b9cad34af2da5841 SHA512 768f0e55c2992b0ce50187a62e4c75ae2c2e2c31067d77898d221ad89afba20a3121853f01267bf6f1e43942ddca273bfed6c63849ce922c9c9d2c971a9061e0
DIST hin9-v0.9.4.tar.gz 77019 BLAKE2B 7339b407ba60c740f51f47794bd5fa4b73c662c718841c8de10be53bc6bec53f5ba511e2f69859ef9312aa85a318f0feeab5088b839dcae1dd734951f52f87a4 SHA512 817ac692778b9b7d9b2b7dd82a0d92fa0303d875601d6b52ddd75bb470cab1c9ac39170a0a1f5737ec4d28849837a8b61bf34bc96481044fe9864932bcfdd6cf
+DIST hin9-v0.9.5.tar.gz 79621 BLAKE2B 2bf1fb03abf1d10d20bd47788e0d2eb39bc01be7fab867fb9b2ddb40e233cc0eed3e55cdfef84881c205de8d35da5bb9a4a56744a69e232b5f7baa6a5910c4a4 SHA512 8db159d95b008f3f4070844ba078f523f6159461c66ebe889e0a0af473e3a888cefa43eedc97c450b3a7bcc35079bfa4530cdcc8741da513a17e08ea896af1f5
diff --git a/www-servers/hinsightd/files/hinsightd-defines-v3.patch b/www-servers/hinsightd/files/hinsightd-defines-v3.patch
new file mode 100644
index 000000000..271481f1f
--- /dev/null
+++ b/www-servers/hinsightd/files/hinsightd-defines-v3.patch
@@ -0,0 +1,21 @@
+diff --git a/src/hin/conf.h b/src/hin/conf.h
+index 61db395..1eaaa14 100644
+--- a/src/hin/conf.h
++++ b/src/hin/conf.h
+@@ -2,11 +2,11 @@
+ #ifndef HIN_CONF_H
+ #define HIN_CONF_H
+
+-#define HIN_CONF_PATH "workdir/main.lua"
+-#define HIN_LOGDIR_PATH "workdir/logs/"
+-#define HIN_WORKDIR_PATH "./"
+-#define HIN_TEMP_PATH "/tmp/"
+-#define HIN_DEBUG_MASK 0xffffffff
++#define HIN_CONF_PATH "/etc/hinsightd/main.lua"
++#define HIN_LOGDIR_PATH "/var/log/hinsightd/"
++#define HIN_WORKDIR_PATH "/etc/hinsightd/"
++#define HIN_TEMP_PATH "/var/tmp/hinsightd/"
++#define HIN_DEBUG_MASK 0x27f0f
+
+ #define HIN_URING_QUEUE_DEPTH 256
+ #define HIN_URING_DONT_FORK 0
diff --git a/www-servers/hinsightd/files/initd-v1.sh b/www-servers/hinsightd/files/initd-v1.sh
new file mode 100644
index 000000000..c0c2da823
--- /dev/null
+++ b/www-servers/hinsightd/files/initd-v1.sh
@@ -0,0 +1,50 @@
+#!/sbin/openrc-run
+
+NAME=$RC_SVCNAME
+RUN_DIR=/var/run/$NAME
+LOG_DIR=/var/log/$NAME
+TMP_DIR=/var/tmp/$NAME
+CWD_DIR=/var/www/localhost
+PID_FILE=$RUN_DIR/$NAME.pid
+CFG_FILE=/etc/hinsightd/main.lua
+LOG_FILE=$LOG_DIR/hindsight.log
+
+RUN_FILE=/usr/sbin/hinsightd
+RUN_USER="hinsightd"
+
+extra_commands="checkconfig reload"
+
+command=$RUN_FILE
+command_args="--config $CFG_FILE --logdir $LOG_DIR --cwd $CWD_DIR --pidfile $PID_FILE --tmpdir $TMP_DIR --log $LOG_FILE"
+pidfile="$PID_FILE"
+command_args_background="--daemonize"
+command_user="$RUN_USER:$RUN_USER"
+
+depend() {
+ use net
+}
+
+checkconfig() {
+ start-stop-daemon --quiet --user $RUN_USER --start --exec $command -- --check $command_args
+}
+
+start_pre() {
+ checkpath --directory --owner $command_user --mode 06770 $LOG_DIR $TMP_DIR $RUN_DIR
+ checkconfig || return 1
+}
+
+reload() {
+ if ! service_started "${NAME}" ; then
+ eerror " * ERROR ${NAME} isn't running"
+ return 1
+ fi
+
+ checkconfig || return 1
+
+ echo " * Reloading ${NAME} ..."
+
+ start-stop-daemon --quiet --signal USR1 --pidfile ${PID_FILE}
+ eend $?
+}
+
+
diff --git a/www-servers/hinsightd/hinsightd-9999.ebuild b/www-servers/hinsightd/hinsightd-0.9.5.ebuild
similarity index 88%
copy from www-servers/hinsightd/hinsightd-9999.ebuild
copy to www-servers/hinsightd/hinsightd-0.9.5.ebuild
index f8d82a655..727392d53 100644
--- a/www-servers/hinsightd/hinsightd-9999.ebuild
+++ b/www-servers/hinsightd/hinsightd-0.9.5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-LUA_COMPAT=( lua5-{1..4} )
+LUA_COMPAT=( lua5-{1..4} luajit )
inherit fcaps lua-single systemd cmake linux-info
@@ -42,7 +42,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}/hinsightd-redefine-directories-v2.patch"
+ "${FILESDIR}/hinsightd-defines-v3.patch"
)
src_configure() {
@@ -53,8 +53,8 @@ src_configure() {
}
src_install() {
- newbin "${BUILD_DIR}/hin9" $PN
- newinitd "${FILESDIR}/init.d.sh" $PN
+ newsbin "${BUILD_DIR}/hin9" $PN
+ newinitd "${FILESDIR}/initd-v1.sh" $PN
systemd_dounit "${FILESDIR}/$PN.service" # not tested
# config
@@ -71,7 +71,7 @@ src_install() {
}
pkg_postinst() {
- fcaps CAP_NET_BIND_SERVICE /usr/bin/$PN
+ fcaps CAP_NET_BIND_SERVICE /usr/sbin/$PN
if kernel_is lt 5 7; then
ewarn ""
diff --git a/www-servers/hinsightd/hinsightd-9999.ebuild b/www-servers/hinsightd/hinsightd-9999.ebuild
index f8d82a655..727392d53 100644
--- a/www-servers/hinsightd/hinsightd-9999.ebuild
+++ b/www-servers/hinsightd/hinsightd-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-LUA_COMPAT=( lua5-{1..4} )
+LUA_COMPAT=( lua5-{1..4} luajit )
inherit fcaps lua-single systemd cmake linux-info
@@ -42,7 +42,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}/hinsightd-redefine-directories-v2.patch"
+ "${FILESDIR}/hinsightd-defines-v3.patch"
)
src_configure() {
@@ -53,8 +53,8 @@ src_configure() {
}
src_install() {
- newbin "${BUILD_DIR}/hin9" $PN
- newinitd "${FILESDIR}/init.d.sh" $PN
+ newsbin "${BUILD_DIR}/hin9" $PN
+ newinitd "${FILESDIR}/initd-v1.sh" $PN
systemd_dounit "${FILESDIR}/$PN.service" # not tested
# config
@@ -71,7 +71,7 @@ src_install() {
}
pkg_postinst() {
- fcaps CAP_NET_BIND_SERVICE /usr/bin/$PN
+ fcaps CAP_NET_BIND_SERVICE /usr/sbin/$PN
if kernel_is lt 5 7; then
ewarn ""
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-20 13:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-30 9:37 [gentoo-commits] repo/proj/guru:master commit in: www-servers/hinsightd/, www-servers/hinsightd/files/ Haelwenn Monnier
-- strict thread matches above, loose matches on Subject: below --
2021-06-20 13:07 Andrew Ammerlaan
2021-04-19 8:04 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox