cleanup and rename

airy/Dockerfile

@@ -15,9 +15,9 @@ RUN python -m poetry config virtualenvs.in-project true && \
     python -m poetry install --no-root
 USER root
 RUN rm -rf /var/cache/* && \
-    mkdir /var/kyii-upload -p && \
-    chown app:app /var/kyii-upload && \
-    chmod 770 /var/kyii-upload
+    mkdir /var/kankin-upload -p && \
+    chown app:app /var/kankin-upload && \
+    chmod 770 /var/kankin-upload
 USER app
 
 COPY . /app/

airy/Makefile

@@ -14,30 +14,30 @@ install: install-main install-service
 
 install-main:
 	$(PRE_INSTALL)
-	useradd -m -c "Kyii Airy" -d "/opt/kyii-airy-home" kyii-airy
+	useradd -m -c "Kyii Airy" -d "/opt/kankin-airy-home" kankin-airy
 	$(NORMAL_INSTALL)
-	cp -r . /opt/kyii-airy-home/airy
-	cp -r ./deploy/* /opt/kyii-airy-home/
-	chown kyii-airy:kyii-airy /opt/kyii-airy-home/ -R
-	chmod u+x /opt/kyii-airy-home/start.sh
+	cp -r . /opt/kankin-airy-home/airy
+	cp -r ./deploy/* /opt/kankin-airy-home/
+	chown kankin-airy:kankin-airy /opt/kankin-airy-home/ -R
+	chmod u+x /opt/kankin-airy-home/start.sh
 	$(POST_INSTALL)
-	su -s /bin/bash -c 'bash /opt/kyii-airy-home/setup.sh' kyii-airy
+	su -s /bin/bash -c 'bash /opt/kankin-airy-home/setup.sh' kankin-airy
 
 install-service:
 	$(NORMAL_INSTALL)
-	cp ./deploy/kyii-airy.service /usr/lib/systemd/system/kyii-airy.service
+	cp ./deploy/kankin-airy.service /usr/lib/systemd/system/kankin-airy.service
 	$(POST_INSTALL)
 	systemctl daemon-reload
-	systemctl enable kyii-airy.service
+	systemctl enable kankin-airy.service
 
 uninstall: uninstall-main uninstall-service
 
 uninstall-main:
-	userdel kyii-airy
-	rm -r /opt/kyii-airy-home
+	userdel kankin-airy
+	rm -r /opt/kankin-airy-home
 
 uninstall-service:
-	rm /usr/lib/systemd/system/kyii-airy.service
+	rm /usr/lib/systemd/system/kankin-airy.service
 
 messages.pot:
 	pybabel extract -F ./babel.cfg -k _l -o messages.pot .

airy/airy/config.py

@@ -47,7 +47,7 @@ class Config:
 
     # Verifiers
     VERIFIER_WEBAUTHN = dict(
-        rp_id="https://yuui.kyii.nyiyui.ca",
+        rp_id="https://yuui.kankin.nyiyui.ca",
         rp_name="Airy",
     )
 

airy/airy/docker_config.py

@@ -1,3 +1,3 @@
 def init_app(app):
-    app.config["UPLOAD_PATH"] = "/var/kyii-upload"
+    app.config["UPLOAD_PATH"] = "/var/kankin-upload"
     app.config["SILICA_IMAGES_TMP_PATH"] = "/tmp"

airy/airy/local_config_sample.py

@@ -1,11 +1,11 @@
 def init_app(app):
     app.config["SECRET_KEY"] = "change me!"
     app.config["HOST"] = "localhost"
-    app.config["UPLOAD_PATH"] = ".local/kyii-upload"
+    app.config["UPLOAD_PATH"] = ".local/kankin-upload"
     app.config["VERIFIER_WEBAUTHN_ORIGIN"] = "http://localhost:5000"
     app.config["VERIFIER_WEBAUTHN"] = dict(
         rp_id="localhost",
         rp_name="local testing airy",
     )
     app.config["CACHE_TYPE"] = "SimpleCache"
-    app.config["SILICA_IMAGES_TMP_PATH"] = ".local/tmp-kyii-upload/"
+    app.config["SILICA_IMAGES_TMP_PATH"] = ".local/tmp-kankin-upload/"

airy/airy/seed.py

@@ -102,7 +102,7 @@ def seed():
                     "client_uri": "http://localhost:8001",
                     "grant_types": ["authorization_code"],
                     "redirect_uris": [
-                        "http://localhost:8001/accounts/kyii/login/callback/"
+                        "http://localhost:8001/accounts/kankin/login/callback/"
                     ],
                     "response_types": ["code"],
                     "scope": "openid profile",

airy/airy/translations/en/LC_MESSAGES/messages.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: +kyii@nyiyui.ca\n"
+"Report-Msgid-Bugs-To: +kankin@nyiyui.ca\n"
 "POT-Creation-Date: 2023-10-12 14:47-0400\n"
 "PO-Revision-Date: 2022-11-03 02:29-0400\n"
 "Last-Translator: nyiyui <@nyiyui.ca>\n"

airy/deploy/kyii-airy.service

@@ -2,9 +2,9 @@
 Description=main process for Kyii Airy
 
 [Service]
-ExecStart=/opt/kyii-airy-home/start.sh
-User=kyii-airy
-WorkingDirectory=/opt/kyii-airy-home
+ExecStart=/opt/kankin-airy-home/start.sh
+User=kankin-airy
+WorkingDirectory=/opt/kankin-airy-home
 
 [Install]
 WantedBy=network.target

airy/deploy/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/env bash
 
-cd /opt/kyii-airy-home/airy
+cd /opt/kankin-airy-home/airy
 python3 -m pip install --user pipenv
-/opt/kyii-airy-home/.local/bin/pipenv install --skip-lock
-/opt/kyii-airy-home/.local/bin/pipenv install --skip-lock uwsgi
+/opt/kankin-airy-home/.local/bin/pipenv install --skip-lock
+/opt/kankin-airy-home/.local/bin/pipenv install --skip-lock uwsgi

airy/deploy/start.sh

@@ -1,5 +1,5 @@
 #!/bin/env sh
 
-cd /opt/kyii-airy-home/airy
+cd /opt/kankin-airy-home/airy
 
-/opt/kyii-airy-home/.local/bin/pipenv run uwsgi --ini /opt/kyii-airy-home/uwsgi.ini
+/opt/kankin-airy-home/.local/bin/pipenv run uwsgi --ini /opt/kankin-airy-home/uwsgi.ini

airy/deploy/uwsgi.ini

@@ -1,8 +1,8 @@
 [uwsgi]
-chdir = /opt/kyii-airy-home/airy
-socket = /opt/kyii-airy-home/uwsgi.sock
+chdir = /opt/kankin-airy-home/airy
+socket = /opt/kankin-airy-home/uwsgi.sock
 chmod-socket = 660
-chown-socket = kyii-airy:www-data
+chown-socket = kankin-airy:www-data
 module = airy.wsgi:app
 
 master = true

airy/docker-compose.yml

@@ -5,7 +5,7 @@ services:
   airy:
     build: ./
     volumes:
-      - ./airy/docker/local_config.py:/opt/kyii-airy/airy/local_config.py
+      - ./airy/docker/local_config.py:/opt/kankin-airy/airy/local_config.py
     networks:
       - main
   nginx:
@@ -24,8 +24,8 @@ services:
     volumes:
       - database:/var/lib/mysql
     environment:
-      MYSQL_DATABASE: kyii_airy_db
-      MYSQL_USER: kyii_airy_user
+      MYSQL_DATABASE: kankin_airy_db
+      MYSQL_USER: kankin_airy_user
       MYSQL_PASSWORD: very_secure_password
       MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
     networks:

docker-compose.yml

@@ -7,7 +7,7 @@ services:
   airy:
     build: ./airy/
     volumes:
-      - ./airy/docker/local_config.py:/opt/kyii-airy/airy/local_config.py
+      - ./airy/docker/local_config.py:/opt/kankin-airy/airy/local_config.py
     networks:
       - main
   yuui:
@@ -16,7 +16,7 @@ services:
     ports:
       - 8080:8080
     environment:
-      NGINX_HOST: "kyii2.nyiyui.ca"
+      NGINX_HOST: "kankin2.nyiyui.ca"
       NGINX_PORT: "8080"
     networks:
       - main
@@ -31,8 +31,8 @@ services:
     volumes:
       - database:/var/lib/mysql
     environment:
-      MYSQL_DATABASE: kyii_airy_db
-      MYSQL_USER: kyii_airy_user
+      MYSQL_DATABASE: kankin_airy_db
+      MYSQL_USER: kankin_airy_user
       MYSQL_PASSWORD: very_secure_password
       MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
     networks: