From a0a36bbf3b9f26314db5958b27fbf4242ee04514 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Sun, 4 Oct 2020 13:24:36 +0200
Subject: [PATCH] remove gitea bin versioning as downgrading is not supported
 anyway

---
 defaults/main.yml                             |  4 ++--
 molecule/centos7/converge.yml                 | 11 ----------
 tasks/install.yml                             | 20 +++++--------------
 templates/custom/conf/app.ini.j2              |  2 +-
 templates/etc/systemd/system/gitea.service.j2 |  2 +-
 5 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index b1428cf..1054666 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -9,7 +9,6 @@ gitea_packages:
   - git
 
 gitea_base_dir: "/opt/gitea"
-gitea_bin_dir: "{{ gitea_base_dir }}/bin"
 gitea_config_dir: "{{ gitea_base_dir }}/custom/conf"
 gitea_data_dir: "{{ gitea_base_dir }}/data"
 gitea_template_dir: "{{ gitea_base_dir }}/custom/templates"
@@ -69,7 +68,8 @@ gitea_registration_email_domain_whitelist: []
 gitea_registration_allow_external_only: False
 gitea_registration_button_enabled: True
 
-gitea_db_type: pgsql
+gitea_db_type: sqlite
+# Configurations only applies to non-sqlite provider.
 gitea_db_server: localhost
 gitea_db_port: 5432
 gitea_db_name: gitea
diff --git a/molecule/centos7/converge.yml b/molecule/centos7/converge.yml
index 5e2e30f..f1d295c 100644
--- a/molecule/centos7/converge.yml
+++ b/molecule/centos7/converge.yml
@@ -1,16 +1,5 @@
 ---
 - name: Converge
   hosts: all
-  vars:
-    postgres_repository_enabled: True
-    postgres_users:
-      - name: "pggitea"
-        password: "secure"
-        priv: ALL
-        db: "gitea"
-    postgres_dbs:
-      - name: "gitea"
-
   roles:
-    - role: xoxys.postgres
     - role: xoxys.gitea
diff --git a/tasks/install.yml b/tasks/install.yml
index 7c9c29b..7cd86b9 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -14,7 +14,6 @@
     path: "{{ item }}"
     state: directory
   loop:
-    - "{{ gitea_bin_dir }}"
     - "{{ gitea_config_dir }}"
     - "{{ gitea_data_dir }}"
     - "{{ gitea_log_dir }}"
@@ -22,22 +21,13 @@
   become: True
   become_user: "{{ gitea_user }}"
 
-- block:
-    - name: Download Gitea binary
-      get_url:
-        url: "https://dl.gitea.io/gitea/{{ gitea_version }}/gitea-{{ gitea_version }}-linux-amd64"
-        dest: "{{ gitea_bin_dir }}/gitea-{{ gitea_version }}"
-        mode: 0750
-
-    - name: Link Version {{ gitea_version }} to latest
-      file:
-        src: "{{ gitea_bin_dir }}/gitea-{{ gitea_version }}"
-        dest: "{{ gitea_base_dir }}/gitea-latest"
-        state: link
-      notify: __gitea_restart
+- name: Download Gitea binary
+  get_url:
+    url: "https://dl.gitea.io/gitea/{{ gitea_version }}/gitea-{{ gitea_version }}-linux-amd64"
+    dest: "{{ gitea_base_dir }}/gitea"
+    mode: 0750
   become: True
   become_user: "{{ gitea_user }}"
-  when: not gitea_installed.stat.exists or gitea_current.stdout is version_compare(gitea_version, operator='<', strict=True)
 
 - block:
     - name: Copy config file
diff --git a/templates/custom/conf/app.ini.j2 b/templates/custom/conf/app.ini.j2
index 116e0f6..7a83243 100644
--- a/templates/custom/conf/app.ini.j2
+++ b/templates/custom/conf/app.ini.j2
@@ -110,7 +110,7 @@ NAME = {{ gitea_db_name }}
 USER = {{ gitea_db_user }}
 PASSWD = {{ gitea_db_password }}
 SSL_MODE = {{ gitea_db_ssl_mode }}
-{% else %}
+{% elif gitea_db_type == "sqlite" %}
 DB_TYPE = sqlite3
 PATH = {{ gitea_data_dir }}/gitea.db
 SQLITE_TIMEOUT = 500
diff --git a/templates/etc/systemd/system/gitea.service.j2 b/templates/etc/systemd/system/gitea.service.j2
index 5fdd5f8..854f7e7 100644
--- a/templates/etc/systemd/system/gitea.service.j2
+++ b/templates/etc/systemd/system/gitea.service.j2
@@ -12,7 +12,7 @@ Environment=GITEA_WORK_DIR={{ gitea_base_dir }}
 User={{ gitea_user }}
 Group={{ gitea_group }}
 WorkingDirectory={{ gitea_base_dir }}
-ExecStart={{ gitea_base_dir }}/gitea-latest web -c {{ gitea_config_dir }}/app.ini
+ExecStart={{ gitea_base_dir }}/gitea web -c {{ gitea_config_dir }}/app.ini
 Restart=on-failure
 PrivateTmp=yes