arrdem/source
1
0
Fork 0
Code Issues 11 Pull requests Projects Releases Packages Wiki Activity

Tweaks to working state

Browse source
This commit is contained in:
Reid 'arrdem' McKenzie 2022-11-26 20:05:35 -07:00
parent fc2662d2f7
commit adaa3873ba
5 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
projects/activitypub_relay/Dockerfile
View file

@ -4,14 +4,15 @@ FROM library/python:3.10
RUN pip install --upgrade pip RUN pip install --upgrade pip
RUN useradd -d /app app RUN useradd -d /app app
RUN mkdir -p /app RUN mkdir -p /app /data
RUN chown -R app:app /app RUN chown -R app:app /app /data
USER app USER app
WORKDIR /app WORKDIR /app
VOLUME /data VOLUME /data
ENV DOCKER_RUNNING=true ENV DOCKER_RUNNING=true
ENV PYTHONPATH="/app:${PYTHONPATH}" ENV PYTHONPATH="/app:${PYTHONPATH}"
ENV PYTHONUNBUFFERED=true
ENV PATH="/app/.local/bin:${PATH}" ENV PATH="/app/.local/bin:${PATH}"
### App specific crap ### App specific crap
@ -22,4 +23,4 @@ COPY --chown=app:app docker_relay.sh /app/relay.sh
COPY --chown=app:app src/python /app/ COPY --chown=app:app src/python /app/
EXPOSE 8080 EXPOSE 8080
ENTRYPOINT ["/bin/sh", "/app/relay.sh"] CMD ["/bin/sh", "/app/relay.sh"]

0
projects/activitypub_relay/deploy.sh Normal file → Executable file
View file

6
projects/activitypub_relay/docker_relay.sh
View file

@ -2,10 +2,12 @@
# A launcher script for the dockerized relay # A launcher script for the dockerized relay
set -e
# First do config init if needed # First do config init if needed
if [ ! -f "/data/config.yml" ]; then if [ ! -f "/data/config.yml" ]; then
python3 -m "relay" setup python3 -m "relay" -c "/data/config.yml" setup
fi fi
# Then run the blame thing # Then run the blame thing
exec python3 -m "relay" "${@:-run}" exec python3 -m "relay" -c "/data/config.yml" "${@:-run}"

2
projects/activitypub_relay/src/python/relay/__main__.py
View file

@ -26,7 +26,7 @@ def cli(ctx, config):
"error": logging.ERROR, "error": logging.ERROR,
"critical": logging.CRITICAL, "critical": logging.CRITICAL,
"fatal": logging.FATAL, "fatal": logging.FATAL,
}.get(os.getenv("LOG_LEVE", "INFO").lower(), logging.INFO) }.get(os.getenv("LOG_LEVEL", "INFO").lower(), logging.INFO)
logging.basicConfig( logging.basicConfig(
level=level, level=level,

4
projects/activitypub_relay/src/python/relay/views.py
View file

@ -25,7 +25,7 @@ def register_route(method, path):
@register_route("GET", "/") @register_route("GET", "/")
async def home(request): async def home(request):
targets = "<br>".join(request.app.database.hostnames) targets = "<ul>" + "\n".join(f"<li>{it}</li>" for it in request.app.database.hostnames) + "</ul>"
note = request.app.config.note note = request.app.config.note
count = len(request.app.database.hostnames) count = len(request.app.database.hostnames)
host = request.app.config.host host = request.app.config.host
@ -44,7 +44,7 @@ a:hover {{ color: #8AF; }}
<body> <body>
<p>This is an Activity Relay for fediverse instances.</p> <p>This is an Activity Relay for fediverse instances.</p>
<p>{note}</p> <p>{note}</p>
<p>To host your own relay, you may download the code at this address: <a href="https://git.pleroma.social/pleroma/relay">https://git.pleroma.social/pleroma/relay</a></p> <p>To host your own relay, you may download the code at this address: <a href="https://git.arrdem.com/arrdem/source/src/branch/trunk/projects/activitypub_relay">https://git.arrdem.com/arrdem/source/src/branch/trunk/projects/activitypub_relay</a></p>
<br><p>List of {count} registered instances:<br>{targets}</p> <br><p>List of {count} registered instances:<br>{targets}</p>
</body></html>""" </body></html>"""