diff options
| author | Lars Wirzenius <liw@liw.fi> | 2023-10-12 14:21:17 +0300 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2023-10-12 14:21:17 +0300 |
| commit | a25a6b079146b3a3d84ff1db86b7eb391221ffea (patch) | |
| tree | 2951e2191da587746e1740862f85aa28ef27127d /ansible | |
| parent | b45b4cddb7d8ee40ceeb6b654971ec137645820b (diff) | |
| download | ansibleness-a25a6b079146b3a3d84ff1db86b7eb391221ffea.tar.gz | |
apt.liw.fi: fixes
Sponsored-by: author
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/apt.liw.fi.yml (renamed from ansible/apt.liw.fi) | 2 | ||||
| -rw-r--r-- | ansible/hosts | 1 | ||||
| -rw-r--r-- | ansible/roles/apt-repository/files/process-incoming | 3 | ||||
| -rw-r--r-- | ansible/roles/apt-repository/tasks/main.yml | 15 |
4 files changed, 14 insertions, 7 deletions
diff --git a/ansible/apt.liw.fi b/ansible/apt.liw.fi.yml index c37d7b2..ad29b9c 100644 --- a/ansible/apt.liw.fi +++ b/ansible/apt.liw.fi.yml @@ -35,6 +35,8 @@ apt_distributions: - codename: unstable-ci description: CI builds for unstable + - codename: unstable + description: builds for unstable apt_signing_key: "{{ lookup('pipe', 'pass show ick2/apt_key') }}" apt_signing_key_pub: "{{ lookup('pipe', 'pass show ick2/apt_key.pub') }}" apt_signing_key_fingerprint: | diff --git a/ansible/hosts b/ansible/hosts index 2c5499d..bee1bd3 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -14,6 +14,7 @@ icktool obnam-bench obnam-dev radicle-dev +radicle-test riki-dev sshca-dev subplot-dev diff --git a/ansible/roles/apt-repository/files/process-incoming b/ansible/roles/apt-repository/files/process-incoming index d18b151..b668c88 100644 --- a/ansible/roles/apt-repository/files/process-incoming +++ b/ansible/roles/apt-repository/files/process-incoming @@ -8,5 +8,6 @@ echo "Processing incoming" reprepro -v -b /srv/apt processincoming default reprepro -v -b /srv/apt export + rm -f incoming/*.buildinfo echo "Finished processing incoming" -) 2>&1 >>/srv/apt/reprepro.log +) 2>&1 >>/home/apt/reprepro.log diff --git a/ansible/roles/apt-repository/tasks/main.yml b/ansible/roles/apt-repository/tasks/main.yml index d9c2ac2..39f8c44 100644 --- a/ansible/roles/apt-repository/tasks/main.yml +++ b/ansible/roles/apt-repository/tasks/main.yml @@ -108,7 +108,7 @@ - name: "install script to process uploads to APT" copy: src: process-incoming - dest: /srv/apt/process-incoming + dest: /home/apt/process-incoming owner: apt group: apt mode: 0755 @@ -116,9 +116,12 @@ - name: "create incrontab for apt" copy: content: | - /srv/apt/incoming IN_CLOSE_WRITE /srv/apt/process-incoming - dest: /srv/apt/incrontab + /srv/apt/incoming IN_CLOSE_WRITE /home/apt/process-incoming + dest: /home/apt/incrontab + owner: apt + group: apt + mode: 0644 -# - name: "set up incrontab for processing incoming uploads" -# shell: | -# sudo -u apt incrontab /srv/apt/incrontab +- name: "set up incrontab for processing incoming uploads" + shell: | + sudo -u apt incrontab /home/apt/incrontab |