Skip to content

Commit b7a1180

Browse files
committed
Fix for the virtualenv
1 parent 23fee9b commit b7a1180

File tree

5 files changed

+12
-71
lines changed

5 files changed

+12
-71
lines changed

roles/semaphore/handlers/main.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
---
2-
- name: Requirements update
3-
ansible.builtin.systemd:
4-
name: requirements.service
5-
daemon_reload: true
6-
state: started
7-
82
- name: Restart semaphore
93
ansible.builtin.systemd:
104
name: semaphore

roles/semaphore/tasks/present.yml

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -112,43 +112,24 @@
112112
- "{{ semaphore_config_dir }}"
113113
- /home/semaphore/tmp
114114

115-
- name: Create python3.12 venv
116-
become: true
117-
become_user: semaphore
118-
ansible.builtin.command: /usr/bin/python3.12 -m venv venv --upgrade-deps
119-
args:
120-
chdir: /home/semaphore
121-
creates: /home/semaphore/venv
122-
notify: Requirements update
123-
124115
- name: Copy requirements for Semaphore
125116
ansible.builtin.copy:
126-
src: "{{ item }}"
117+
src: requirements.txt
127118
dest: /home/semaphore/
128119
owner: semaphore
129120
group: semaphore
130121
mode: '0640'
131-
loop:
132-
- requirements.txt
133-
- requirements.yml
134-
- collections.yml
135-
notify: Requirements update
136-
137-
- name: Manage requirements update service
138-
ansible.builtin.template:
139-
src: "requirements.{{ item }}.j2"
140-
dest: "/etc/systemd/system/requirements.{{ item }}"
141-
mode: '0644'
142-
loop:
143-
- 'service'
144-
- 'timer'
122+
notify: Restart semaphore
145123

146-
- name: Enable requirements update service
147-
ansible.builtin.systemd:
148-
name: requirements.timer
149-
enabled: true
150-
state: started
151-
daemon_reload: true
124+
- name: Create virtual environment and install requirements into it
125+
become: true
126+
become_user: semaphore
127+
ansible.builtin.pip:
128+
requirements: '/home/semaphore/requirements.txt'
129+
virtualenv: '/home/semaphore/venv'
130+
virtualenv_python: python3.12
131+
state: present
132+
notify: Restart semaphore
152133

153134
- name: Deploy Semaphore Config
154135
become: true

roles/semaphore/templates/requirements.service.j2

Lines changed: 0 additions & 22 deletions
This file was deleted.

roles/semaphore/templates/requirements.timer.j2

Lines changed: 0 additions & 10 deletions
This file was deleted.

roles/semaphore/templates/semaphore.service.j2

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ StandardOutput=syslog
2121
StandardError=syslog
2222
SyslogIdentifier=semaphore
2323

24-
ExecStart=/bin/bash -c 'rm -rf /home/semaphore/venv \
25-
&& python3.12 -m venv /home/semaphore/venv \
26-
&& source /home/semaphore/venv/bin/activate \
24+
ExecStart=/bin/bash -c 'source /home/semaphore/venv/bin/activate \
2725
&& /usr/bin/semaphore server --config /etc/semaphore/config.json'
2826

2927
[Install]

0 commit comments

Comments
 (0)