Merge pull request #169 from adrinux/issue165-fix-themes

Fix for Issue #165 missing themes

README.md

@@ -165,8 +165,8 @@ This is because the Forgejo project maintains both `stable` and `old stable` rel
 | variable name | default value | description |
 | ------------- | ------------- | ----------- |
 | `gitea_show_user_email` | `false` | Do you want to display email addresses ? (true/false) |
-| `gitea_theme_default` | `auto` | Default theme |
-| `gitea_themes` | `auto,gitea,arc-green` | List of enabled themes |
+| `gitea_theme_default` | `gitea-auto` or `forgejo-auto` | Default theme |
+| `gitea_themes` | (See `defaults/gitea.yml` or `defaults/forgejo.yml`)| List of enabled themes |
 | `gitea_ui_extra_config` | | you can use this variable to pass additional config parameters in the `[ui]` section of the config. |
 
 ### UI - Meta ([ui.meta](https://docs.gitea.com/administration/config-cheat-sheet#ui---metadata-uimeta))

defaults/forgejo.yml

@@ -0,0 +1,5 @@
+---
+gitea_theme_default: "forgejo-auto"
+# yamllint disable rule:line-length
+gitea_themes: "forgejo-auto,forgejo-light,forgejo-dark,gitea-auto,gitea-light,gitea-dark,forgejo-auto-deuteranopia-protanopia,forgejo-light-deuteranopia-protanopia,forgejo-dark-deuteranopia-protanopia,forgejo-auto-tritanopia,forgejo-light-tritanopia,forgejo-dark-tritanopia"
+# yamllint enable rule:line-length

defaults/gitea.yml

@@ -0,0 +1,3 @@
+---
+gitea_theme_default: "gitea-auto"
+gitea_themes: "gitea-auto,gitea-light,gitea-dark"

defaults/main.yml

@@ -92,8 +92,6 @@ gitea_cors_extra: ''
 # UI (ui)
 # -> https://docs.gitea.io/en-us/config-cheat-sheet/#ui-ui
 gitea_show_user_email: false
-gitea_theme_default: 'auto'
-gitea_themes: 'auto,gitea,arc-green'
 gitea_ui_extra_config: ''
 
 # UI - Metadata (ui.meta)

tasks/main.yml

@@ -18,6 +18,15 @@
       ansible.builtin.fail:
         msg: "Currently only {{ gitea_supported_forks }} are supported."
 
+- name: Gather Gitea/Forgejo UI Theme variables
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
+  vars:
+    params:
+      files:
+        - "{{ gitea_fork }}.yml"
+      paths:
+        - "defaults"
+
 - name: Gather variables for each operating system
   ansible.builtin.include_vars:
     file: "{{ lookup('first_found', gitea_variables) }}"

templates/gitea.ini.j2

@@ -174,7 +174,6 @@ ENABLE_CAPTCHA = {{ gitea_enable_captcha | ternary('true', 'false') }}
 DEFAULT_KEEP_EMAIL_PRIVATE = {{ gitea_default_keep_mail_private | ternary('true', 'false') }}
 SHOW_REGISTRATION_BUTTON = {{ gitea_show_registration_button | ternary('true', 'false') }}
 AUTO_WATCH_NEW_REPOS = {{ gitea_auto_watch_new_repos | ternary('true', 'false') }}
-ALLOW_ONLY_EXTERNAL_REGISTRATION = {{ gitea_only_allow_external_registration | ternary('true', 'false') }}
 AUTO_WATCH_ON_CHANGES = {{ gitea_autowatch_on_change | ternary('true', 'false') }}
 SHOW_MILESTONES_DASHBOARD_PAGE = {{ gitea_show_milestones_dashboard_page | ternary('true', 'false') }}
 REGISTER_MANUAL_CONFIRM = {{ gitea_register_manual_confirm | ternary('true', 'false') }}

vars/main.yml

@@ -63,5 +63,5 @@ transfer_custom_footer:
     - 'files/gitea_footer/extra_links_footer.tmpl'
     - 'files/extra_links_footer.tmpl'
 
-playbook_version_number: 59
+playbook_version_number: 60
 playbook_version_path: 'do1jlr.gitea.version'