Skip to content

Commit

Permalink
Merge pull request #115 from quotengrote/typo
Browse files Browse the repository at this point in the history
fix typo
  • Loading branch information
DO1JLR authored Jul 23, 2023
2 parents 2d174e2 + fb4293b commit 666616b
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Either you define exactly which release you install. Or you use the option ``lat
| `gitea_user_home` | `{{ gitea_home }}` | home of gitea user |
| `gitea_executable_path` | `/usr/local/bin/gitea` | Path for gitea executable |
| `gitea_forgejo_executable_path` | `/usr/local/bin/forgejo` | Path for forgejo executable |
| `gitea_configuraion_path` | `/etc/gitea` | Where to put the gitea.ini config |
| `gitea_configuration_path` | `/etc/gitea` | Where to put the gitea.ini config |
| `gitea_shell` | `/bin/false` | UNIX shell used by gitea. Set it to `/bin/bash` if you don't use the gitea built-in ssh server. |
| `gitea_systemd_cap_net_bind_service` | `false` | Adds `AmbientCapabilities=CAP_NET_BIND_SERVICE` to systemd service file |

Expand Down
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ gitea_home: '/var/lib/gitea'
gitea_user_home: '{{ gitea_home }}'
gitea_executable_path: '/usr/local/bin/gitea'
gitea_forgejo_executable_path: '/usr/local/bin/forgejo'
gitea_configuraion_path: '/etc/gitea'
gitea_configuration_path: '/etc/gitea'
gitea_shell: '/bin/false'
gitea_systemd_cap_net_bind_service: false

Expand Down
2 changes: 1 addition & 1 deletion tasks/backup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
- name: Backing up gitea before upgrade
become: true
ansible.builtin.command:
cmd: "sudo -u {{ gitea_user }} {{ gitea_full_executable_path }} dump -c {{ gitea_configuraion_path }}/gitea.ini"
cmd: "sudo -u {{ gitea_user }} {{ gitea_full_executable_path }} dump -c {{ gitea_configuration_path }}/gitea.ini"
chdir: "{{ gitea_backup_location }}"
changed_when: true
rescue:
Expand Down
2 changes: 1 addition & 1 deletion tasks/configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
become: true
ansible.builtin.template:
src: gitea.ini.j2
dest: "{{ gitea_configuraion_path }}/gitea.ini"
dest: "{{ gitea_configuration_path }}/gitea.ini"
owner: "{{ gitea_user }}"
group: "{{ gitea_group }}"
mode: 0600
Expand Down
2 changes: 1 addition & 1 deletion tasks/directory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
group: "{{ gitea_group }}"
mode: 'u=rwX,g=rX,o='
with_items:
- "{{ gitea_configuraion_path }}"
- "{{ gitea_configuration_path }}"
- "{{ gitea_user_home }}"
- "{{ gitea_home }}"
- "{{ gitea_home }}/data"
Expand Down
12 changes: 6 additions & 6 deletions tasks/gitea_secrets.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
- name: Generate gitea SECRET_KEY if not provided
become: true
ansible.builtin.shell: 'umask 077; {{ gitea_full_executable_path }} generate secret SECRET_KEY > {{ gitea_configuraion_path }}/gitea_secret_key'
ansible.builtin.shell: 'umask 077; {{ gitea_full_executable_path }} generate secret SECRET_KEY > {{ gitea_configuration_path }}/gitea_secret_key'
args:
creates: '{{ gitea_configuraion_path }}/gitea_secret_key'
creates: '{{ gitea_configuration_path }}/gitea_secret_key'
when: gitea_secret_key | string | length == 0

- name: Read gitea SECRET_KEY from file
become: true
ansible.builtin.slurp:
src: '{{ gitea_configuraion_path }}/gitea_secret_key'
src: '{{ gitea_configuration_path }}/gitea_secret_key'
register: remote_secret_key
when: gitea_secret_key | string | length == 0

Expand All @@ -20,15 +20,15 @@

- name: Generate gitea INTERNAL_TOKEN if not provided
become: true
ansible.builtin.shell: 'umask 077; {{ gitea_full_executable_path }} generate secret INTERNAL_TOKEN > {{ gitea_configuraion_path }}/gitea_internal_token'
ansible.builtin.shell: 'umask 077; {{ gitea_full_executable_path }} generate secret INTERNAL_TOKEN > {{ gitea_configuration_path }}/gitea_internal_token'
args:
creates: '{{ gitea_configuraion_path }}/gitea_internal_token'
creates: '{{ gitea_configuration_path }}/gitea_internal_token'
when: gitea_internal_token | string | length == 0

- name: Read gitea INTERNAL_TOKEN from file
become: true
ansible.builtin.slurp:
src: '{{ gitea_configuraion_path }}/gitea_internal_token'
src: '{{ gitea_configuration_path }}/gitea_internal_token'
register: remote_internal_token
when: gitea_internal_token | string | length == 0

Expand Down
12 changes: 6 additions & 6 deletions tasks/jwt_secrets.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
- name: Generate OAuth2 JWT_SECRET if not provided
become: true
ansible.builtin.shell: 'umask 077; {{ gitea_full_executable_path }} generate secret JWT_SECRET > {{ gitea_configuraion_path }}/gitea_oauth_jwt_secret'
ansible.builtin.shell: 'umask 077; {{ gitea_full_executable_path }} generate secret JWT_SECRET > {{ gitea_configuration_path }}/gitea_oauth_jwt_secret'
args:
creates: '{{ gitea_configuraion_path }}/gitea_oauth_jwt_secret'
creates: '{{ gitea_configuration_path }}/gitea_oauth_jwt_secret'
when: gitea_oauth2_jwt_secret | length == 0

- name: Read OAuth2 JWT_SECRET from file
become: true
ansible.builtin.slurp:
src: '{{ gitea_configuraion_path }}/gitea_oauth_jwt_secret'
src: '{{ gitea_configuration_path }}/gitea_oauth_jwt_secret'
register: oauth_jwt_secret
when: gitea_oauth2_jwt_secret | length == 0

Expand All @@ -20,15 +20,15 @@

- name: Generate LFS JWT_SECRET if not provided
become: true
ansible.builtin.shell: 'umask 077; {{ gitea_full_executable_path }} generate secret JWT_SECRET > {{ gitea_configuraion_path }}/gitea_lfs_jwt_secret'
ansible.builtin.shell: 'umask 077; {{ gitea_full_executable_path }} generate secret JWT_SECRET > {{ gitea_configuration_path }}/gitea_lfs_jwt_secret'
args:
creates: '{{ gitea_configuraion_path }}/gitea_lfs_jwt_secret'
creates: '{{ gitea_configuration_path }}/gitea_lfs_jwt_secret'
when: gitea_lfs_jwt_secret | length == 0

- name: Read LFS JWT_SECRET from file
become: true
ansible.builtin.slurp:
src: '{{ gitea_configuraion_path }}/gitea_lfs_jwt_secret'
src: '{{ gitea_configuration_path }}/gitea_lfs_jwt_secret'
register: lfs_jwt_secret
when: gitea_lfs_jwt_secret | length == 0

Expand Down
2 changes: 1 addition & 1 deletion templates/gitea.service.j2
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ After=network.target
[Service]
User={{ gitea_user }}
Group={{ gitea_group }}
ExecStart={{ gitea_full_executable_path }} web --config {{ gitea_configuraion_path }}/gitea.ini --custom-path {{ gitea_custom }}/
ExecStart={{ gitea_full_executable_path }} web --config {{ gitea_configuration_path }}/gitea.ini --custom-path {{ gitea_custom }}/
Restart=on-failure
WorkingDirectory={{ gitea_home }}
{% if gitea_systemd_cap_net_bind_service %}
Expand Down

0 comments on commit 666616b

Please sign in to comment.