diff --git a/.gitignore b/.gitignore index 1de0750..9d9b1a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,10 @@ -gitea/* -!gitea/gitea/ +gitea.bak/ +forgejo/* +!forgejo/gitea/ +forgejo/gitea/* +!forgejo/gitea/templates/ +!forgejo/gitea/public/ -gitea/gitea/* -!gitea/gitea/templates/ -!gitea/gitea/public/ soft/* !soft/setup.nim diff --git a/Makefile b/Makefile deleted file mode 100644 index d3dea85..0000000 --- a/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -.PHONY: lint -lint: - black soft/config/*.py - prettier -w ./soft/config/soft-serve.config.json - -.PHONY: update-soft-serve -update-soft-serve: soft-repos - docker compose restart soft-serve - -.PHONY: soft-repos -soft-repos: - ./soft/config/update-soft-serve-repos.py - diff --git a/docker-compose.yml b/docker-compose.yml index b7bc2fa..841b83f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,15 +1,15 @@ version: "3" services: - gitea: - image: gitea/gitea:1.21.0 - container_name: gitea + forgejo: + image: codeberg.org/forgejo/forgejo:1.21.4-0 + container_name: forgejo environment: - USER_UID=1002 - USER_GID=100 restart: always volumes: - - ./gitea:/data + - ./forgejo:/data - /home/git/.ssh/:/data/git/.ssh - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro diff --git a/gitea/gitea/public/assets/css/theme-catppuccin-mocha-blue.css b/forgejo/gitea/public/assets/css/theme-catppuccin-mocha-blue.css similarity index 100% rename from gitea/gitea/public/assets/css/theme-catppuccin-mocha-blue.css rename to forgejo/gitea/public/assets/css/theme-catppuccin-mocha-blue.css diff --git a/gitea/gitea/public/assets/css/theme-catppuccin-mocha-flamingo.css b/forgejo/gitea/public/assets/css/theme-catppuccin-mocha-flamingo.css similarity index 100% rename from gitea/gitea/public/assets/css/theme-catppuccin-mocha-flamingo.css rename to forgejo/gitea/public/assets/css/theme-catppuccin-mocha-flamingo.css diff --git a/gitea/gitea/public/assets/css/theme-catppuccin-mocha-green.css b/forgejo/gitea/public/assets/css/theme-catppuccin-mocha-green.css similarity index 100% rename from gitea/gitea/public/assets/css/theme-catppuccin-mocha-green.css rename to forgejo/gitea/public/assets/css/theme-catppuccin-mocha-green.css diff --git a/gitea/gitea/public/assets/css/theme-catppuccin-mocha-lavender.css b/forgejo/gitea/public/assets/css/theme-catppuccin-mocha-lavender.css similarity index 100% rename from gitea/gitea/public/assets/css/theme-catppuccin-mocha-lavender.css rename to forgejo/gitea/public/assets/css/theme-catppuccin-mocha-lavender.css diff --git a/gitea/gitea/public/assets/css/theme-catppuccin-mocha-maroon.css b/forgejo/gitea/public/assets/css/theme-catppuccin-mocha-maroon.css similarity index 100% rename from gitea/gitea/public/assets/css/theme-catppuccin-mocha-maroon.css rename to forgejo/gitea/public/assets/css/theme-catppuccin-mocha-maroon.css diff --git a/gitea/gitea/public/assets/css/theme-catppuccin-mocha-mauve.css b/forgejo/gitea/public/assets/css/theme-catppuccin-mocha-mauve.css similarity index 100% rename from gitea/gitea/public/assets/css/theme-catppuccin-mocha-mauve.css rename to forgejo/gitea/public/assets/css/theme-catppuccin-mocha-mauve.css diff --git a/gitea/gitea/public/assets/css/theme-catppuccin-mocha-peach.css b/forgejo/gitea/public/assets/css/theme-catppuccin-mocha-peach.css similarity index 100% rename from gitea/gitea/public/assets/css/theme-catppuccin-mocha-peach.css rename to forgejo/gitea/public/assets/css/theme-catppuccin-mocha-peach.css diff --git a/gitea/gitea/public/assets/css/theme-catppuccin-mocha-pink.css b/forgejo/gitea/public/assets/css/theme-catppuccin-mocha-pink.css similarity index 100% rename from gitea/gitea/public/assets/css/theme-catppuccin-mocha-pink.css rename to forgejo/gitea/public/assets/css/theme-catppuccin-mocha-pink.css diff --git a/gitea/gitea/public/assets/css/theme-catppuccin-mocha-red.css b/forgejo/gitea/public/assets/css/theme-catppuccin-mocha-red.css similarity index 100% rename from gitea/gitea/public/assets/css/theme-catppuccin-mocha-red.css rename to forgejo/gitea/public/assets/css/theme-catppuccin-mocha-red.css diff --git a/gitea/gitea/public/assets/css/theme-catppuccin-mocha-rosewater.css b/forgejo/gitea/public/assets/css/theme-catppuccin-mocha-rosewater.css similarity index 100% rename from gitea/gitea/public/assets/css/theme-catppuccin-mocha-rosewater.css rename to forgejo/gitea/public/assets/css/theme-catppuccin-mocha-rosewater.css diff --git a/gitea/gitea/public/assets/css/theme-catppuccin-mocha-sapphire.css b/forgejo/gitea/public/assets/css/theme-catppuccin-mocha-sapphire.css similarity index 100% rename from gitea/gitea/public/assets/css/theme-catppuccin-mocha-sapphire.css rename to forgejo/gitea/public/assets/css/theme-catppuccin-mocha-sapphire.css diff --git a/gitea/gitea/public/assets/css/theme-catppuccin-mocha-sky.css b/forgejo/gitea/public/assets/css/theme-catppuccin-mocha-sky.css similarity index 100% rename from gitea/gitea/public/assets/css/theme-catppuccin-mocha-sky.css rename to forgejo/gitea/public/assets/css/theme-catppuccin-mocha-sky.css diff --git a/gitea/gitea/public/assets/css/theme-catppuccin-mocha-teal.css b/forgejo/gitea/public/assets/css/theme-catppuccin-mocha-teal.css similarity index 100% rename from gitea/gitea/public/assets/css/theme-catppuccin-mocha-teal.css rename to forgejo/gitea/public/assets/css/theme-catppuccin-mocha-teal.css diff --git a/gitea/gitea/public/assets/css/theme-catppuccin-mocha-yellow.css b/forgejo/gitea/public/assets/css/theme-catppuccin-mocha-yellow.css similarity index 100% rename from gitea/gitea/public/assets/css/theme-catppuccin-mocha-yellow.css rename to forgejo/gitea/public/assets/css/theme-catppuccin-mocha-yellow.css diff --git a/gitea/gitea/public/assets/img/apple-touch-icon.png b/forgejo/gitea/public/assets/img/apple-touch-icon.png similarity index 100% rename from gitea/gitea/public/assets/img/apple-touch-icon.png rename to forgejo/gitea/public/assets/img/apple-touch-icon.png diff --git a/gitea/gitea/public/assets/img/avatar_default.png b/forgejo/gitea/public/assets/img/avatar_default.png similarity index 100% rename from gitea/gitea/public/assets/img/avatar_default.png rename to forgejo/gitea/public/assets/img/avatar_default.png diff --git a/gitea/gitea/public/assets/img/favicon.png b/forgejo/gitea/public/assets/img/favicon.png similarity index 100% rename from gitea/gitea/public/assets/img/favicon.png rename to forgejo/gitea/public/assets/img/favicon.png diff --git a/gitea/gitea/public/assets/img/favicon.svg b/forgejo/gitea/public/assets/img/favicon.svg similarity index 100% rename from gitea/gitea/public/assets/img/favicon.svg rename to forgejo/gitea/public/assets/img/favicon.svg diff --git a/gitea/gitea/public/assets/img/logo.png b/forgejo/gitea/public/assets/img/logo.png similarity index 100% rename from gitea/gitea/public/assets/img/logo.png rename to forgejo/gitea/public/assets/img/logo.png diff --git a/gitea/gitea/public/assets/img/logo.svg b/forgejo/gitea/public/assets/img/logo.svg similarity index 100% rename from gitea/gitea/public/assets/img/logo.svg rename to forgejo/gitea/public/assets/img/logo.svg