浏览代码

Fixed a few small issues in gogs role and added a dependency to common-restic so state of gogs is automatically backed up

Till Klocke 8 年之前
父节点
当前提交
f5360f8e30

+ 2 - 1
roles/service-gogs/defaults/main.yml

@@ -12,7 +12,8 @@ gogs_archive: "{{ ansible_env.HOME }}/{{ gogs_package_name }}"
 
 gogs_repo_dir: "{{ gogs_home }}/repo"
 gogs_config_file: "{{ gogs_home }}/gogs/custom/conf/app.ini"
-gogs_sqlite_path: "{{ gogs_home }}/db/gogs.db"
+gogs_sqlite_dir: "{{ gogs_home }}/db"
+gogs_sqlite_path: "{{ gogs_sqlite_dir }}/gogs.db"
 
 gogs_cfg_app_name: FFDO git service
 gogs_cfg_mode: prod # Either "dev", "prod" or "test"

+ 7 - 0
roles/service-gogs/meta/main.yml

@@ -0,0 +1,7 @@
+---
+dependencies:
+  - role: common-restic
+    restic_backup_now: false
+    restic_stateful_dirs:
+      - dir: "{{ gogs_repo_dir }}"
+      - dir: "{{ gogs_sqlite_path }}"

+ 1 - 1
roles/service-gogs/tasks/gogs.yml

@@ -41,7 +41,7 @@
 - name: create gogs db dir if necessary
   become: yes
   file:
-    dest: "{{ gogs_sqlite_path }}"
+    dest: "{{ gogs_sqlite_dir }}"
     owner: "{{ gogs_user }}"
     group: "{{ gogs_group }}"
     mode: 0755

+ 1 - 1
roles/service-gogs/tasks/nginx.yml

@@ -30,7 +30,7 @@
     state: started
 
 - stat:
-    path: "/var/lib/acme/live/{{ gogs_domain }}/privkey;"
+    path: "/var/lib/acme/live/{{ gogs_domain }}/privkey"
   become: yes
   register: gogs_key_file_stat