Skip to content

Commit

Permalink
Changed domain name from youzim.it to zimit.kiwix.org
Browse files Browse the repository at this point in the history
  • Loading branch information
rgaudin committed May 2, 2024
1 parent 79e53a2 commit 3f678c7
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
GHCRIO_USERNAME=${{ secrets.GHCR_USERNAME }}
GHCRIO_TOKEN=${{ secrets.GHCR_TOKEN }}

- name: Deploy Zimit frontend changes to youzim.it
- name: Deploy Zimit frontend changes to zimit.kiwix.org
uses: actions-hub/kubectl@master
env:
KUBE_CONFIG: ${{ secrets.ZIMIT_KUBE_CONFIG }}
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ WORKDIR /app/
ENV MONGODB_URI mongodb://localhost
ENV MAIN_PREFIX /api
ENV ZIMIT_API_URL /api/v1
ENV ZIMFARM_WEBAPI https://api.farm.youzim.it/v1
ENV ZIMFARM_WEBAPI https://api.zimit.kiwix.org/v1
ENV INTERNAL_ZIMFARM_WEBAPI http://dispatcher.backend.zimit.kiwixoffline.node.intern/v1
ENV _ZIMFARM_USERNAME -
ENV _ZIMFARM_PASSWORD -
Expand All @@ -39,11 +39,11 @@ ENV _ZIMFARM_PASSWORD -
# ENV ZIMIT_TIME_LIMIT 7200

# notifications
ENV MAILGUN_API_URL https://api.mailgun.net/v3/mg.youzim.it
ENV MAILGUN_FROM Youzim.it <info@youzim.it>
ENV MAILGUN_API_URL https://api.mailgun.net/v3/mg.zimit.kiwix.org
ENV MAILGUN_FROM Zimit <info@zimit.kiwix.org>
# ENV MAILGUN_API_KEY -
ENV PUBLIC_URL https://youzim.it
ENV PUBLIC_API_URL https://youzim.it/api/v1
ENV PUBLIC_URL https://zimit.kiwix.org
ENV PUBLIC_API_URL https://zimit.kiwix.org/api/v1
# ENV HOOK_TOKEN somestring

# prestart script (former entrypoint - database init)
Expand Down
2 changes: 1 addition & 1 deletion api/src/routes/requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def post(self, *args, **kwargs):
document["flags"].get("zim-file", url.hostname) + f"_{ident}.zim"
)

document["flags"]["userAgentSuffix"] = "Youzim.it+"
document["flags"]["userAgentSuffix"] = "zimit.kiwix.org+"

# remove flags we don't want to overwrite
for flag in ("adminEmail", "output", "statsFilename"):
Expand Down
12 changes: 7 additions & 5 deletions api/src/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
DEFAULT_DISK = "1GiB"
DEFAULT_MAX_SIZE_LIMIT = 2**30 * 4
DEFAULT_MAX_TIME_LIMIT = 3600 * 2
ZIMFARM_API_URL = os.getenv("INTERNAL_ZIMFARM_WEBAPI", "https://api.farm.youzim.it/v1")
ZIMFARM_API_URL = os.getenv(
"INTERNAL_ZIMFARM_WEBAPI", "https://api.farm.zimit.kiwix.org/v1"
)
ZIMFARM_USERNAME = os.getenv("_ZIMFARM_USERNAME", "-")
ZIMFARM_PASSWORD = os.getenv("_ZIMFARM_PASSWORD", "-")
ZIMIT_IMAGE = os.getenv("ZIMIT_IMAGE", "openzim/zimit:1.2.0")
Expand Down Expand Up @@ -64,14 +66,14 @@
TASK_WORKER = os.getenv("TASK_WORKER")

# mailgun
MAILGUN_FROM = os.getenv("MAILGUN_FROM", "Youzim.it <info@youzim.it>")
MAILGUN_FROM = os.getenv("MAILGUN_FROM", "Zimit <info@zimit.kiwix.org>")
MAILGUN_API_KEY = os.getenv("MAILGUN_API_KEY", "")
MAILGUN_API_URL = os.getenv(
"MAILGUN_API_URL", "https://api.mailgun.net/v3/mg.youzim.it"
"MAILGUN_API_URL", "https://api.mailgun.net/v3/mg.zimit.kiwix.org"
)
# notifications callback
PUBLIC_URL = os.getenv("PUBLIC_URL", "https://youzim.it")
PUBLIC_API_URL = os.getenv("PUBLIC_API_URL", "https://youzim.it/api/v1")
PUBLIC_URL = os.getenv("PUBLIC_URL", "https://zimit.kiwix.org")
PUBLIC_API_URL = os.getenv("PUBLIC_API_URL", "https://zimit.kiwix.org/api/v1")
ZIM_DOWNLOAD_URL = os.getenv(
"ZIM_DOWNLOAD_URL", "https://s3.us-west-1.wasabisys.com/org-kiwix-zimit/zim"
)
Expand Down
4 changes: 2 additions & 2 deletions api/src/templates/email_body.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% if task.status == "requested" %}
<h2>Zim requested!</h2>
<p>Your Zim request of <a href="{{ task.config.flags.url }}">{{ task.config.flags.url }}</a> has been recorded.</p>
<p>You can follow the status of this request at <a href="{{ base_url }}/{{ task._id }}">youzim.it/{{ task._id }}</a>.</p>
<p>You can follow the status of this request at <a href="{{ base_url }}/{{ task._id }}">zimit.kiwix.org/{{ task._id }}</a>.</p>
<p>We'll send you another email once your Zim file is ready to download.</p>
{% endif %}

Expand All @@ -20,6 +20,6 @@ <h2>Zim is ready!</h2>

{% if task.status in ("failed", "canceled") %}<h2>Your zim request has failed!</h2>
<p>We are really sorry. </p>
<p>This might be due to an error with the URL you entered (<a href="{{ task.config.flags.url }}">{{ task.config.flags.url }}</a>). Please double check and <a href="https://youzim.it">try again</a>.</p>{% endif %}
<p>This might be due to an error with the URL you entered (<a href="{{ task.config.flags.url }}">{{ task.config.flags.url }}</a>). Please double check and <a href="https://zimit.kiwix.org">try again</a>.</p>{% endif %}
</body>
</html>
2 changes: 1 addition & 1 deletion api/src/templates/email_subject.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Youzim.it task {{ task._id|short_id }} {{ task.status }}
Zimit task {{ task._id|short_id }} {{ task.status }}
2 changes: 1 addition & 1 deletion ui/public/environ.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"ZIMFARM_WEBAPI": "https://api.farm.youzim.it/v1",
"ZIMFARM_WEBAPI": "https://api.farm.zimit.kiwix.org/v1",
"ZIMIT_API_URL": "/api/v1"
}
2 changes: 1 addition & 1 deletion ui/src/components/NavBar.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<header>
<router-link :to="{ name: 'home' }"><img alt="Youzim.it logo" src="../assets/ZIMIT_LOGO_RGB.svg"></router-link>
<router-link :to="{ name: 'home' }"><img alt="Zimit logo" src="../assets/ZIMIT_LOGO_RGB.svg"></router-link>
<Loading/>
</header>
</template>
Expand Down

0 comments on commit 3f678c7

Please sign in to comment.