7 files changed, 62 insertions, 151 deletions
diff --git a/www-apps/meta-srht/files/meta.sr.ht-api.service b/www-apps/meta-srht/files/meta.sr.ht-api.service
new file mode 100644
index 0000000..ee94056
--- /dev/null
+++ b/www-apps/meta-srht/files/meta.sr.ht-api.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=meta.sr.ht API service
+After= network.target
+
+[Service]
+Type=simple
+User=metasrht
+Restart=always
+ExecStart=/usr/bin/metasrht-api -b :5100
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-apps/meta-srht/files/meta.sr.ht-daily.service b/www-apps/meta-srht/files/meta.sr.ht-daily.service
new file mode 100644
index 0000000..2642ec9
--- /dev/null
+++ b/www-apps/meta-srht/files/meta.sr.ht-daily.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=meta.sr.ht job
+After=network.target
+
+[Service]
+Type=oneshot
+User=metasrht
+ExecStart=/usr/bin/metasrht-daily
diff --git a/www-apps/meta-srht/files/meta.sr.ht-daily.timer b/www-apps/meta-srht/files/meta.sr.ht-daily.timer
new file mode 100644
index 0000000..2462204
--- /dev/null
+++ b/www-apps/meta-srht/files/meta.sr.ht-daily.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Daily meta.sr.ht job
+
+[Timer]
+OnCalendar=daily
+Persistent=true
+
+[Install]
+WantedBy=timers.target
diff --git a/www-apps/meta-srht/files/meta.sr.ht-webhooks.service b/www-apps/meta-srht/files/meta.sr.ht-webhooks.service
new file mode 100644
index 0000000..e0baf48
--- /dev/null
+++ b/www-apps/meta-srht/files/meta.sr.ht-webhooks.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=meta.sr.ht webhooks service
+After= network.target
+
+[Service]
+Type=simple
+User=metasrht
+Restart=always
+ExecStart=/usr/bin/celery -A metasrht.webhooks worker --loglevel=INFO
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-apps/meta-srht/files/meta.sr.ht.service b/www-apps/meta-srht/files/meta.sr.ht.service
index ab22f07..4944a2f 100644
--- a/www-apps/meta-srht/files/meta.sr.ht.service
+++ b/www-apps/meta-srht/files/meta.sr.ht.service
@@ -1,150 +1,12 @@
-<!DOCTYPE html>
-
-<html lang="en">
-<head>
-<meta charset="utf8"/>
-<meta content="width=device-width, initial-scale=1" name="viewport"/>
-<title>~sircmpwn/sr.ht-pkgbuilds: meta.sr.ht/meta.sr.ht.service - sourcehut git</title>
-<link href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAMAAAD04JH5AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4QIGCC8n92KyhQAAAj1QTFRFAAAA////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////anIwUQAAAL50Uk5TAAECAwQFBgcICQoLDA4PEBESExQVFhcYGRobHB0eHyAhIyQmJygpKistLzAzNDU2Nzg5Ozw9QEFDREZHSElLTE1OT1BRVFdYWVpbXF1eX2BhZGZnaGltbnBxdHV3eHp7fn+AgYKDhIWGh4iJio2TlJucnqGio6Smp6ipqqusrbCxsrO0tre4ury9vr/Cw8TFxsfIycrMzc7P0dLT1dbY2dvf4OLj5OXm5+jq6+zt7u/w8fL09fb3+Pn6+/z9/gNzyOkAAAABYktHRL6k3IPDAAAFwUlEQVQYGe3B+VtUVQAG4G9i0TQZZyA1S0JxydzDNFTUqXBfcylzS8UE21TMyjAQUQnFEi0BHQU3cAc0UGbm+9v65Zw7y70zc++dc3qenof3xZAhQ4b8T+V/uGn/kdrm1psdHTdbm2uP7Ns434//yLD5e+u7aOH+6T0ludBszGf1L5jC87rNBdDm9XXnw0wrfG71cOhQ9N0z2vTk20Ko9t5PYToQOj4FKr17IkKHwtUToMobVQN0of/rkVDik7t06c5yZC7/V1rqajq6f9vKQFlZYNW2A0cvdNPSL35kaPEDmgxerFiSjwQFZQebQzTpKkUmsg4xUX/Nijwk4V15aoAJIhVZcM13ngnatuQhJe/WNiY464VLE28xXsMCD9LyLDzLeMEiuDLzIeM0zIRNs88xTvcMuFDSx1htC+FA6XXG6pkLx0qeM8aLHdlwJGfnP4zRNw8OzexjjOaJcGzSn4zR8z4cmfiQUZF9WXAhuyLCqO4iOOC7xahni+BSWQ+jgl7YlnWeUR3FcG1qJ6MasmDXIUZdexMZGNvGqAOwaTGjrnqREd/fNERKYUvBAxqueZEhXzsNXX7Y8SsNHW8iY+M6afgZNnxKw7NiKDCtl4YA0nrjHqXIIiixjIY7I5FOFQ37oEglDZVIo+glpeYsKJJ9mdJAIVI7QenFRChT3E+pGim9F6G0AwrtohSeglR+otSWDYVygpSqkUJRmNJCKLWEUmgCkvuOUgPU8vxO6TCSev0ZpZlQ7ANKj4YhmXWUGqBcI6UVSOY8pQVQbhGlM0hiTJhCmwfKeW5QCPlh7TNKW6DBdkobYa2eQn8eNPC9pPAbLA17QaEGWtRS6MuBlfmUVkCLtZTmwspeCoN50MIXprATVuopXIQmLRROwUoXhQpoUkXhNizkU1oCTZZRyoPZh5Tyock4SnNgtolCF3TxPKKwBmb7KTRBm0sUdsPsCIWj0OY4hR9gVkthP7SppHASZs0UtkGbLyg0wqyVwkpos4FCC8xuUghAm3IK7TDroFAGbQIUgjDroFAGbQIUgjC7SSEAbcoptMOslcIqaLOBQgvMmilsgzY7KDTCrJbCAWhTReEkzI5QOAptfqTwPcz2UbgAbS5R2AWzjRS6oYvnMYXVMJtPqQCavEVpNsz8lMqgyXJKo2DhPoWD0OQwhU5YOU2hGZpcoVADK3sohLzQwh+h8CWslFBaCS3WUZoDK7nPKZyCFnUUerNh6TSFAS808L+iUANrmylthQafU1oPawVhCm0eKOcJUhgcjSTOUVoI5RZTqkMyqymdhXJNlMqRzPAnlGZDsRJKD3OR1LeUzkEtTxOlSiRXGKL0EZRaSmlwPFI4Tul6DhTKvUXpGFKZEqa0EwrtoRQqRkrVlP6ZBGUmD1A6htQm9FP6IxuK5Fyl1P8O0viahgoo8g0NB5HOyDuUImVQ4mMabo9AWgEaeqZCgel9NCyFDb/Q0DkWGXv7Lg0nYIe/i4Y2HzKUf4OGe6NhS2mEhr98yEh+Kw3hBbCpglHt45CB8TcY9RXsyjrLqM5pcG36XUadfg22eYOM6l0Glz7uY9T1UXCg6AFjHMqGCznfMMb9Qjgyo4cxLhfDsclXGePpdDg0r48x+nflwJHcPQOM0TsLjs3rYazgEtjnWXqLsZ7Oggszuhnn9w9gU0kT49yfDleKgozXuMiDtDyLmxjveiFc8jYwwY3tPqTk/zzIBPWj4FpWRYQJXtau9SEJ/7q6V0wQ/uo1ZKK0iybhlqplYxHP89byw1ciNLm3ABny/0xLjy4dr/xiQ3kgUL5hR9WPlx7T0onRyFzgDl26vRRKjKwcoAv9B0dAlcLqMB0KH3sHKk2pDtGBwWPFUG3C4Ue06WHleOgwbMWZENMarCvPhTb+jb/1MYXemvWjoVnO3J2nbtNCZ82Xc7LxH8mbs2b3DycbW9qDwfaWxpPf71o9exSGDBky5P/pX9F6dsCMuJp+AAAAAElFTkSuQmCC" rel="icon" type="image/png"/>
-<link href="/static/main.min.b88acf60.css" rel="stylesheet"/>
-<style>
-pre {
-  tab-size: 8
-}
-</style>
-<meta content="git" name="vcs"/>
-<meta content="https://git.sr.ht/~sircmpwn/sr.ht-pkgbuilds" name="vcs:clone"/>
-<meta content="git@git.sr.ht:~sircmpwn/sr.ht-pkgbuilds" name="vcs:clone"/>
-<meta content="https://git.sr.ht/~sircmpwn/sr.ht-pkgbuilds" name="forge:summary"/>
-<meta content="https://git.sr.ht/~sircmpwn/sr.ht-pkgbuilds/tree/{ref}/item/{path}" name="forge:dir"/>
-<meta content="https://git.sr.ht/~sircmpwn/sr.ht-pkgbuilds/tree/{ref}/item/{path}" name="forge:file"/>
-<meta content="https://git.sr.ht/~sircmpwn/sr.ht-pkgbuilds/blob/{ref}/{path}" name="forge:rawfile"/>
-<meta content="https://git.sr.ht/~sircmpwn/sr.ht-pkgbuilds/tree/{ref}/item/{path}#L{line}" name="forge:line"/>
-<meta content="git.sr.ht/~sircmpwn/sr.ht-pkgbuilds git https://git.sr.ht/~sircmpwn/sr.ht-pkgbuilds" name="go-import"/>
-</head>
-<body>
-<nav class="navbar navbar-light navbar-expand-sm">
-<span class="navbar-brand">
-<span aria-hidden="true" class="icon icon-circle"><svg height="22" viewbox="0 0 512 512" width="22" xmlns="http://www.w3.org/2000/svg"><path d="M256 8C119 8 8 119 8 256s111 248 248 248 248-111 248-248S393 8 256 8zm0 448c-110.5 0-200-89.5-200-200S145.5 56 256 56s200 89.5 200 200-89.5 200-200 200z"></path></svg>
-</span>
-<a href="https://sr.ht">
-    sourcehut
-  </a>
-</span>
-<ul class="navbar-nav">
-</ul>
-<div class="login">
-<span class="navbar-text">
-<a href="https://meta.sr.ht/oauth/authorize?client_id=25ff6e5ce60d7345&amp;scopes=profile,keys,b99a95de3e69c958/jobs:write&amp;state=%2F~sircmpwn%2Fsr.ht-pkgbuilds%2Ftree%2Fmaster%2Fitem%2Fmeta.sr.ht%2Fmeta.sr.ht.service%3F" rel="nofollow">Log in</a>
-    —
-    <a href="https://meta.sr.ht">Register</a>
-</span>
-</div>
-</nav>
-<div class="header-tabbed">
-<div class="container-fluid">
-<h2>
-<a href="/~sircmpwn/">~sircmpwn</a>/<wbr/>sr.ht-pkgbuilds
-    </h2>
-<ul class="nav nav-tabs">
-<li class="nav-item">
-<a class="nav-link" href="/~sircmpwn/sr.ht-pkgbuilds">summary</a>
-</li>
-<li class="nav-item">
-<a class="nav-link active" href="/~sircmpwn/sr.ht-pkgbuilds/tree">tree</a>
-</li>
-<li class="nav-item">
-<a class="nav-link" href="/~sircmpwn/sr.ht-pkgbuilds/log">log</a>
-</li>
-<li class="nav-item">
-<a class="nav-link" href="/~sircmpwn/sr.ht-pkgbuilds/refs">refs</a>
-</li>
-</ul>
-</div>
-</div>
-<div class="header-extension" style="margin-bottom: 0;">
-<div class="blob container-fluid">
-<span>
-<a href="/~sircmpwn/sr.ht-pkgbuilds/tree/master">sr.ht-pkgbuilds</a>/<a href="/~sircmpwn/sr.ht-pkgbuilds/tree/master/item/meta.sr.ht">meta.sr.ht</a>/meta.sr.ht.service
-
-
-
-  
-  
-  <span class="text-muted" style="margin-left: 1rem">
-<span title="100644">
-      -rw-r--r--
-    </span>
-</span>
-<span class="text-muted" style="margin-left: 1rem">
-<span title="267 bytes">
-        267 bytes
-      </span>
-</span>
-<div class="blob-nav" style="margin-left: 1rem">
-<ul class="nav nav-tabs">
-<li class="nav-item">
-<a class="nav-link active" href="/~sircmpwn/sr.ht-pkgbuilds/tree/master/item/meta.sr.ht/meta.sr.ht.service">View</a>
-</li>
-<li class="nav-item">
-<a class="nav-link" href="/~sircmpwn/sr.ht-pkgbuilds/log/master/item/meta.sr.ht/meta.sr.ht.service">Log</a>
-</li>
-<li class="nav-item">
-<a class="nav-link" href="/~sircmpwn/sr.ht-pkgbuilds/blame/master/meta.sr.ht/meta.sr.ht.service">Blame</a>
-</li>
-<li class="nav-item">
-<a class="nav-link" href="/~sircmpwn/sr.ht-pkgbuilds/blob/master/meta.sr.ht/meta.sr.ht.service">View raw</a>
-</li>
-</ul>
-</div>
-</span>
-<div class="commit">
-<a href="/~sircmpwn/sr.ht-pkgbuilds/commit/master">94c3fbc7</a> —
-      
-      
-      <a href="/~eschwartz/">Eli Schwartz</a>
-      
-      python-pgpy: also run the testsuite
-      <span class="text-muted">
-<span title="2022-10-26 23:59:32 UTC">a month ago</span>
-</span>
-</div>
-<div class="clearfix"></div>
-</div>
-</div>
-<div class="container-fluid code-viewport">
-<div class="row" style="margin-right: 0;">
-<div class="col-md-12 code-view">
-<pre class="ruler"><span>                                                                                </span></pre>
-<pre class="lines"><a href="#L1" id="L1">1</a>
-<a href="#L2" id="L2">2</a>
-<a href="#L3" id="L3">3</a>
-<a href="#L4" id="L4">4</a>
-<a href="#L5" id="L5">5</a>
-<a href="#L6" id="L6">6</a>
-<a href="#L7" id="L7">7</a>
-<a href="#L8" id="L8">8</a>
-<a href="#L9" id="L9">9</a>
-<a href="#L10" id="L10">10</a>
-<a href="#L11" id="L11">11</a>
-<a href="#L12" id="L12">12</a>
-<a href="#L13" id="L13">13</a></pre>
-<div class="highlight"><pre><span></span><span class="k">[Unit]</span><span class="w"></span>
-<span class="na">Description</span><span class="o">=</span><span class="s">meta.sr.ht website service</span><span class="w"></span>
-<span class="na">Requires</span><span class="o">=</span><span class="s">postgresql.service</span><span class="w"></span>
-<span class="na">After</span><span class="o">=</span><span class="s">postgresql.service network.target</span><span class="w"></span>
-
-<span class="k">[Service]</span><span class="w"></span>
-<span class="na">Type</span><span class="o">=</span><span class="s">simple</span><span class="w"></span>
-<span class="na">User</span><span class="o">=</span><span class="s">metasrht</span><span class="w"></span>
-<span class="na">Restart</span><span class="o">=</span><span class="s">always</span><span class="w"></span>
-<span class="na">ExecStart</span><span class="o">=</span><span class="s">/usr/bin/gunicorn metasrht.app:app -b 127.0.0.1:5000</span><span class="w"></span>
-
-<span class="k">[Install]</span><span class="w"></span>
-<span class="na">WantedBy</span><span class="o">=</span><span class="s">multi-user.target</span><span class="w"></span>
-</pre></div>
-</div>
-</div>
-<script src="/static/linelight.js"></script>
-</div></body>
-</html>
-\ No newline at end of file
+[Unit]
+Description=meta.sr.ht website service
+After= network.target
+
+[Service]
+Type=simple
+User=metasrht
+Restart=always
+ExecStart=/usr/bin/gunicorn metasrht.app:app -b 127.0.0.1:5000
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-apps/meta-srht/files/sysusers.conf b/www-apps/meta-srht/files/sysusers.conf
new file mode 100644
index 0000000..3114aec
--- /dev/null
+++ b/www-apps/meta-srht/files/sysusers.conf
@@ -0,0 +1 @@
+u	metasrht	-	"meta.sr.ht user"
diff --git a/www-apps/meta-srht/meta-srht-0.54.4.ebuild b/www-apps/meta-srht/meta-srht-0.54.4.ebuild
index 48a2220..ae168a6 100644
--- a/www-apps/meta-srht/meta-srht-0.54.4.ebuild
+++ b/www-apps/meta-srht/meta-srht-0.54.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_PEP517=setuptools
@@ -46,6 +46,13 @@ src_compile() {
 	ego build -o metasrht-api
 }
 
+src_install() {
+	distutils-r1_src_install
+	dobin "${S}/api/metasrht-api"
+	insinto "/etc/"
+	newins "${S}/config.example.ini"
+}
+
 plg_postinst() {
 	optfeature "billing support" "dev-python/stripe dev-python/weasyprint"
 }