diff --git a/README.org b/README.org index 6fa1bda..527cb42 100644 --- a/README.org +++ b/README.org @@ -33,6 +33,11 @@ gitea_user: git gitea_group: git gitea_http_port: 3000 gitea_ssh_port: 22 +gitea_work_path: /var/lib/gitea +gitea_app_data_path: /var/lib/gitea/data +gitea_repo_root: /var/lib/gitea/data/gitea-repositories +gitea_lfs_path: /var/lib/gitea/data/lfs +gitea_log_path: /var/lib/gitea/log gitea_require_signin_view: true gitea_disable_registration: true gitea_register_manual_confirm: false @@ -64,6 +69,11 @@ gitea_default_keep_email_private: true | gitea_domain | string | Domain to reach Gitea | | gitea_http_port | int | HTTP port | | gitea_ssh_port | int | SSH port | +| gitea_work_path | string | Workdir | +| gitea_app_data_path | string | Application data path | +| gitea_repo_root | string | Repo root path | +| gitea_lfs_path | string | LFS path | +| gitea_log_path | string | Log path | | gitea_root_url | string | Protocol + FQDN + port | | gitea_lfs_jwt_secret | string | LFS storage secret | | gitea_internal_token | string | Internal token | diff --git a/defaults/main.yml b/defaults/main.yml index 08f819d..e8748a7 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -3,6 +3,11 @@ gitea_user: git gitea_group: git gitea_http_port: 3000 gitea_ssh_port: 22 +gitea_work_path: /var/lib/gitea +gitea_app_data_path: /var/lib/gitea/data +gitea_repo_root: /var/lib/gitea/data/gitea-repositories +gitea_lfs_path: /var/lib/gitea/data/lfs +gitea_log_path: /var/lib/gitea/log gitea_require_signin_view: true gitea_disable_registration: true gitea_register_manual_confirm: false diff --git a/tasks/main.yml b/tasks/main.yml index b3d9046..5bd80a3 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -130,7 +130,7 @@ - name: Create the data dir base ansible.builtin.file: - path: /var/lib/gitea + path: "{{ gitea_work_path }}" owner: "{{ gitea_user }}" group: "{{ gitea_group }}" mode: '0750' @@ -144,9 +144,9 @@ mode: '0750' state: directory loop: - - /var/lib/gitea/custom - - /var/lib/gitea/data - - /var/lib/gitea/log + - "{{ gitea_work_path }}/custom" + - "{{ gitea_app_data_path }}" + - "{{ gitea_log_path }}" - name: Create the config dir ansible.builtin.file: diff --git a/tasks/self-signed-cert.yml b/tasks/self-signed-cert.yml index e75d39f..f47ffe6 100644 --- a/tasks/self-signed-cert.yml +++ b/tasks/self-signed-cert.yml @@ -1,7 +1,7 @@ --- - name: Create the certs directory ansible.builtin.file: - path: /var/lib/gitea/certs + path: "{{ gitea_work_path }}/certs" owner: "{{ gitea_user }}" group: "{{ gitea_group }}" mode: '0750' @@ -11,9 +11,9 @@ ansible.builtin.command: > gitea cert --host {{ gitea_domain }},{{ gitea_ssh_domain }} - --out /var/lib/gitea/certs/cert.pem - --keyout /var/lib/gitea/certs/key.pem + --out {{ gitea_work_path }}/certs/cert.pem + --keyout {{ gitea_work_path }}/certs/key.pem become: true become_user: "{{ gitea_user }}" args: - creates: /var/lib/gitea/certs/cert.pem + creates: "{{ gitea_work_path }}/certs/cert.pem" diff --git a/templates/app.ini.j2 b/templates/app.ini.j2 index 1a66af0..276c80d 100644 --- a/templates/app.ini.j2 +++ b/templates/app.ini.j2 @@ -2,7 +2,7 @@ APP_NAME = {{ gitea_app_name }} RUN_USER = {{ gitea_user }} -WORK_PATH = /var/lib/gitea +WORK_PATH = {{ gitea_work_path }} RUN_MODE = prod {% if gitea_database_server | default('') == "postgresql" %} @@ -22,19 +22,19 @@ USER = {{ gitea_user }} PASSWD = SCHEMA = SSL_MODE = disable -PATH = /var/lib/gitea/data/gitea.db +PATH = {{ gitea_app_data_path }}/gitea.db LOG_SQL = false {% endif %} [repository] -ROOT = /var/lib/gitea/data/gitea-repositories +ROOT = {{ gitea_repo_root }} [server] SSH_DOMAIN = {{ gitea_ssh_domain }} DOMAIN = {{ gitea_domain }} HTTP_PORT = {{ gitea_http_port }} ROOT_URL = {{ gitea_root_url }} -APP_DATA_PATH = /var/lib/gitea/data +APP_DATA_PATH = {{ gitea_app_data_path }} DISABLE_SSH = false SSH_PORT = {{ gitea_ssh_port }} LFS_START_SERVER = true @@ -42,7 +42,7 @@ LFS_JWT_SECRET = {{ gitea_lfs_jwt_secret }} OFFLINE_MODE = true [lfs] -PATH = /var/lib/gitea/data/lfs +PATH = {{ gitea_lfs_path }} [mailer] ENABLED = false @@ -73,7 +73,7 @@ PROVIDER = file [log] MODE = console LEVEL = info -ROOT_PATH = /var/lib/gitea/log +ROOT_PATH = {{ gitea_log_path }} [repository.pull-request] DEFAULT_MERGE_STYLE = merge diff --git a/templates/gitea.service.j2 b/templates/gitea.service.j2 index c2e77ea..c10dbce 100644 --- a/templates/gitea.service.j2 +++ b/templates/gitea.service.j2 @@ -13,10 +13,10 @@ RestartSec=2s Type=simple User={{ gitea_user }} Group={{ gitea_group }} -WorkingDirectory=/var/lib/gitea/ +WorkingDirectory={{ gitea_work_path }} ExecStart=/usr/local/bin/gitea web --config /etc/gitea/app.ini Restart=always -Environment=USER={{ gitea_user }} HOME=/home/{{ gitea_user }} GITEA_WORK_DIR=/var/lib/gitea +Environment=USER={{ gitea_user }} HOME=/home/{{ gitea_user }} GITEA_WORK_DIR={{ gitea_work_path }} [Install] WantedBy=multi-user.target