Skip to content
Snippets Groups Projects
Commit 826cbe32 authored by Maxb's avatar Maxb
Browse files

git subrepo commit (merge) float

subrepo:
  subdir:   "float"
  merged:   "1d127174"
upstream:
  origin:   "https://git.autistici.org/ai3/float.git"
  branch:   "master"
  commit:   "c2c4ad89"
git-subrepo:
  version:  "0.4.3"
  origin:   "git@github.com:ingydotnet/git-subrepo"
  commit:   "2f68596"
parent 7f7135ba
No related branches found
No related tags found
2 merge requests!58git subrepo commit (merge) float,!57git subrepo commit (merge) float
Pipeline #110096 failed
......@@ -6,7 +6,7 @@
[subrepo]
remote = https://git.autistici.org/ai3/float.git
branch = master
commit = 4251afa4979c48b9dd36946b2a955d9b57a39d59
commit = c2c4ad89ae7ad3f1f722bf4528e1057c377e2886
parent = d9b2f97887292b92babad1990bd760c23e952416
cmdver = 0.4.1
cmdver = 0.4.3
method = merge
---
- hosts: all
tasks:
- copy:
src: float/roles/float-base/files/apt/deb_autistici_org.gpg
src: ../roles/float-base/files/apt/deb_autistici_org.gpg
dest: /usr/share/keyrings/deb.autistici.org.gpg
- apt:
update_cache: yes
......
......@@ -54,6 +54,7 @@ log-collector:
- /etc/rsyslog-collector-lognorm: /etc/rsyslog-collector-lognorm
- /var/spool/rsyslog-collector: /var/spool/rsyslog
- /var/log/remote: /var/log/remote
egress_policy: internal
- name: kibana
image: registry.git.autistici.org/ai3/docker/kibana:master
port: 5601
......
......@@ -52,6 +52,7 @@ log-collector:
- /etc/rsyslog-collector-lognorm: /etc/rsyslog-collector-lognorm
- /var/spool/rsyslog-collector: /var/spool/rsyslog
- /var/log/remote: /var/log/remote
egress_policy: internal
ports:
- 6514
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment