summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
Diffstat (limited to 'roles')
-rw-r--r--roles/radicle_node/tasks/main.yml13
-rw-r--r--roles/radicle_node/templates/Caddyfile.j28
-rw-r--r--roles/radicle_node/templates/radicle-ci-broker.service.j25
3 files changed, 24 insertions, 2 deletions
diff --git a/roles/radicle_node/tasks/main.yml b/roles/radicle_node/tasks/main.yml
index 5a8a74b..e9c203a 100644
--- a/roles/radicle_node/tasks/main.yml
+++ b/roles/radicle_node/tasks/main.yml
@@ -43,6 +43,11 @@
shell: |
systemctl stop radicle-ci-broker || true
+- name: "configure git for _rad user"
+ shell: |
+ sudo -u _rad git config --global user.name "_rad"
+ sudo -u _rad git config --global user.email "liw@liw.fi"
+
- name: "create directory for Radicle for the _rad user"
file:
state: directory
@@ -59,6 +64,14 @@
group: _rad
mode: 0755
+- name: "create directory for pages from repositories"
+ file:
+ state: directory
+ path: /srv/pages
+ owner: _rad
+ group: _rad
+ mode: 0755
+
- name: "create directory for Radicle backup"
when: radicle_node_backup is defined
file:
diff --git a/roles/radicle_node/templates/Caddyfile.j2 b/roles/radicle_node/templates/Caddyfile.j2
index 5dcd6c8..0271f48 100644
--- a/roles/radicle_node/templates/Caddyfile.j2
+++ b/roles/radicle_node/templates/Caddyfile.j2
@@ -8,3 +8,11 @@
root * /srv/http/
file_server browse
}
+{{ radicle_node_pages_domain_name }}:443 {
+ root * /srv/pages/
+ file_server browse
+}
+{{ radicle_node_wumpus_domain_name }}:443 {
+ root * /srv/wumpus/
+ file_server browse
+}
diff --git a/roles/radicle_node/templates/radicle-ci-broker.service.j2 b/roles/radicle_node/templates/radicle-ci-broker.service.j2
index 3419ae7..239ccc5 100644
--- a/roles/radicle_node/templates/radicle-ci-broker.service.j2
+++ b/roles/radicle_node/templates/radicle-ci-broker.service.j2
@@ -6,8 +6,9 @@ Description=Radicle CI broker
Type=simple
Environment=RAD_HOME=/home/_rad/.radicle
Environment=PATH=/home/_rad/.cargo/bin:/bin:/usr/bin:/sbin:/usr/sbin
-ExecStart=bash -c 'ci-broker /home/_rad/ci-broker.yaml >> /srv/http/broker.log'
-KillMode=cgroup
+Environment=RUST_LOG=info
+ExecStart=/bin/ci-broker /home/_rad/ci-broker.yaml
+KillMode=control-group
Restart=always
RestartSec=1
User=_rad