Update to 2024-05-15 15:01

This commit is contained in:
Daniel Berteaud 2024-05-15 15:01:01 +02:00
parent 64de14d3d5
commit 2c684526ff
19 changed files with 108 additions and 18 deletions

View File

@ -1,11 +1,11 @@
---
# Version to deploy
bookstack_version: '24.02.3'
bookstack_version: '24.05'
# URL of the arhive
bookstack_archive_url: https://github.com/BookStackApp/BookStack/archive/v{{ bookstack_version }}.tar.gz
# Expected sha256 of the archive
bookstack_archive_sha256: 55e11562e550722bbbf923fc4b80f185213c033a297a16d2037b793c73464980
bookstack_archive_sha256: 12673a0c69ce5cea5ae0b0be568da7a88c8510b9cd9e96e7cdeb4026a355482f
# Should ansible handle bookstack upgrades or just the inintial install
bookstack_manage_upgrade: True

View File

@ -29,7 +29,7 @@
- when: bookstack_install_mode != 'none'
block:
- name: Migrate the database
shell: echo yes | /bin/php{{ bookstack_php_version }} {{ bookstack_root_dir }}/app/artisan migrate
command: /bin/php{{ bookstack_php_version }} {{ bookstack_root_dir }}/app/artisan migrate --force
- name: Clear cache
command: /bin/php{{ bookstack_php_version }} {{ bookstack_root_dir }}/app/artisan cache:clear

View File

@ -1,11 +1,11 @@
---
# Veresion of diagrams to deploy
diagrams_version: 24.2.2
diagrams_version: 24.4.0
# URL of the WAR file to deploy
diagrams_war_url: https://github.com/jgraph/drawio/releases/download/v{{ diagrams_version }}/draw.war
# Expected sha256 of the WAR file
diagrams_war_sha256: 049b9d1c97f97c615ed5766c6b68722c73789e138acc26916583f35600abcc9d
diagrams_war_sha256: cea87df556b9fa802a346aabeb16f917e3ecceb1f625f72c05cfc2b9a1318778
# root directory of the installation
diagrams_root_dir: /opt/diagrams
# Should ansible manage upgrades, or just initial install ?

View File

@ -0,0 +1,9 @@
---
- name: Deploy configuration
template: src={{ item.src }} dest={ item.dest }}
loop:
- src: log4j2.xml.j2
dest: "{{ jmeter_root_dir }}/bin/log4j2.xml"
notify: restart jmeter-server
tags: jmeter

View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="info">
<Properties>
<Property name="pattern">%d [%X{idreq} %X{iduser} %X{codeenv}] %-5p
[%c{1}] : %m%n</Property>
<Property name="level">${sys:LOG4J_LEVEL:-info}</Property>
</Properties>
<Appenders>
<Console name="console" target="SYSTEM_OUT" follow="true" >
<PatternLayout pattern="${pattern}" />
</Console>
</Appenders>
<Loggers>
<Logger name="com.myClass.common" level="info" additivity="false">
<AppenderRef ref="console" />
</Logger>
<Logger name="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping" level="${level}" additivity="false">
<AppenderRef ref="console" />
</Logger>
<Logger name="metrics" level="info" additivity="false">
<AppenderRef ref="console" />
</Logger>
<Root level="${level}">
<AppenderRef ref="console" />
</Root>
</Loggers>
</Configuration>

View File

@ -5,12 +5,12 @@
# You can set it to a number or a simple string (no special chars)
kimai_id: 1
# Kimai version to deploy
kimai_version: '2.16.0'
kimai_version: '2.16.1'
# URL of the archive
kimai_archive_url: https://github.com/kevinpapst/kimai2/archive/refs/tags/{{ kimai_version }}.tar.gz
# Expected sha256 of the archive
kimai_archive_sha256: c2c6d87e1099fc43b01f82a90c3a3523fe5da8aa180b0f0130e32c3e2e3820ef
kimai_archive_sha256: 77c3b470c82552eddaf4da962def94a201d0a60b34bd6cd91128ecc149f59ac5
# Directory where kimai will be installed
kimai_root_dir: /opt/kimai_{{ kimai_id }}
# Should ansible handle upgrades or only initial install

View File

@ -1,7 +1,7 @@
---
llng_common_packages:
- lemonldap-ng-conf
- lemonldap-ng-common
- perl-Cache-Cache
- lemonldap-ng-fastcgi-server
- uwsgi-plugin-psgi

View File

@ -1,7 +1,7 @@
---
llng_common_packages:
- lemonldap-ng-conf
- lemonldap-ng-common
- perl-Cache-Cache
- lemonldap-ng-fastcgi-server
- python3-mysql

View File

@ -1,7 +1,7 @@
---
llng_common_packages:
- lemonldap-ng-conf
- lemonldap-ng-common
- perl-Cache-Cache
- lemonldap-ng-fastcgi-server
- python3-PyMySQL

View File

@ -111,6 +111,10 @@ nomad_base_conf:
docker:
enabled: True
allow_privileged: True
disable_log_collection: False
logging:
type: json-file
config: {}
volumes:
enabled: False
# You can set a list of caps allowed for containers. The default is the same set of caps than Docker, minus net_raw
@ -265,3 +269,4 @@ nomad_services: "{{ nomad_base_services | combine(nomad_extra_services, recursiv
# nomad_backup_token: 1677848e-1fcd-b24a-6fb0-56b503d75651
# or a more advanced use
# nomad_backup_token: $(VAULT_TOKEN=$(cat /run/vault_agent/vault.token) vault read -field=secret_id nomad/creds/admin ttl=1m)

View File

@ -167,3 +167,4 @@
- subgid
when: nomad_conf.client.enabled and 'podman' in nomad_enabled_task_drivers
tags: nomad

View File

@ -153,6 +153,23 @@ plugin "docker" {
auth {
config = "{{ nomad_root_dir }}/docker/auth.json"
}
{% if nomad_conf.client.task_drivers.docker.disable_log_collection %}
disable_log_collection = true
{% endif %}
logging {
type = "{{ nomad_conf.client.task_drivers.docker.logging.type }}"
config {
{% for log_conf in nomad_conf.client.task_drivers.docker.logging.config.keys() | list %}
{% if nomad_conf.client.task_drivers.docker.logging.config[log_conf] is boolean %}
{{ log_conf }} = {{ nomad_conf.client.task_drivers.docker.logging.config[log_conf] | ternary('true','false') }}
{% elif nomad_conf.client.task_drivers.docker.logging.config[log_conf] is number %}
{{ log_conf }} = {{ nomad_conf.client.task_drivers.docker.logging.config[log_conf] }}
{% else %}
{{ log_conf }} = "{{ nomad_conf.client.task_drivers.docker.logging.config[log_conf] }}"
{% endif %}
{% endfor %}
}
}
{% if nomad_conf.client.task_drivers.docker.volumes.enabled %}
volumes {
enabled = true

View File

@ -7,7 +7,6 @@
- name: Install nodejs tools
npm: name={{ item }} global=True
loop:
- yarn
- sfnt2woff
tags: penpot
@ -46,6 +45,15 @@
command: ./scripts/build
args:
chdir: "{{ penpot_root_dir }}/tmp/penpot-{{ penpot_version }}/backend"
environment:
PATH: "/usr/lib/jvm/java-21/bin:/opt/penpot/bin:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin"
- name: Install yarn
shell: |
corepack enable
yarn set version 4.0.2
args:
chdir: "{{ penpot_root_dir }}/tmp/penpot-{{ penpot_version }}/frontend"
- name: Build penpot frontend
command: ./scripts/build
@ -53,11 +61,14 @@
chdir: "{{ penpot_root_dir }}/tmp/penpot-{{ penpot_version }}/frontend"
environment:
CURRENT_HASH: "{{ penpot_version }}"
PATH: "/usr/lib/jvm/java-21/bin:/opt/penpot/bin:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin"
- name: Build penpot exporter
command: ./scripts/build
args:
chdir: "{{ penpot_root_dir }}/tmp/penpot-{{ penpot_version }}/exporter"
environment:
PATH: "/usr/lib/jvm/java-21/bin:/opt/penpot/bin:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin"
- name: Install penpot exporter dependencies
command: yarn install

View File

@ -45,6 +45,7 @@ server {
set $redirect_uri "$upstream_http_location";
set $redirect_host "$upstream_http_x_host";
set $redirect_cache_control "$upstream_http_cache_control";
set $real_mtype "$upstream_http_x_mtype";
proxy_buffering off;
@ -59,6 +60,7 @@ server {
add_header x-internal-redirect "$redirect_uri";
add_header x-cache-control "$redirect_cache_control";
add_header cache-control "$redirect_cache_control";
add_header content-type "$real_mtype";
}
location /assets {

View File

@ -7,7 +7,7 @@ Type=simple
User={{ penpot_user }}
WorkingDirectory={{ penpot_root_dir }}/backend
EnvironmentFile={{ penpot_root_dir }}/etc/env
Environment=JAVA_HOME=/usr/lib/jvm/java-17
Environment=JAVA_HOME=/usr/lib/jvm/java-21
ExecStart={{ penpot_root_dir }}/backend/run.sh
SuccessExitStatus=143
PrivateTmp=yes

View File

@ -3,9 +3,9 @@
penpot_packages:
- tar
- zstd
- postgresql14
- java-17-openjdk-headless
- java-17-openjdk-devel
- postgresql16
- java-21-openjdk-headless
- java-21-openjdk-devel
- ghostscript
- ImageMagick
- poppler-utils

View File

@ -0,0 +1,18 @@
---
penpot_packages:
- tar
- zstd
- postgresql16
- java-21-openjdk-headless
- java-21-openjdk-devel
- ghostscript
- ImageMagick
- poppler-utils
- potrace
- netpbm
- liberation-fonts
- fontforge
- woff2-tools
- git
- bzip2

View File

@ -17,8 +17,6 @@ prosody_admin_users: []
# 3rd party modules to install
prosody_base_modules:
- name: mod_auth_ldap
- name: ext_events.lib
url: https://raw.githubusercontent.com/jitsi/jitsi-meet/master/resources/prosody-plugins/ext_events.lib.lua
- name: util.lib
url: https://raw.githubusercontent.com/jitsi/jitsi-meet/master/resources/prosody-plugins/util.lib.lua
- name: mod_speakerstats

View File

@ -7,13 +7,15 @@
description: "{{ item.desc }}"
baseurl: "{{ item.url }}"
gpgcheck: 1
gpgkey: https://lemonldap-ng.org/_media/rpm-gpg-key-ow2
gpgkey: "{{ item.gpg_key }}"
priority: 80
loop:
- repo: lemonldap-ng
url: https://lemonldap-ng.org/redhat/stable/$releasever/noarch
desc: Lemonldap::NG
gpg_key: https://lemonldap-ng.org/security/GPG-KEY-LLNG-SECURITY.asc
- repo: lemonldap-ng-extras
url: https://lemonldap-ng.org/redhat/extras/$releasever
desc: Lemonldap::NG Extras packages
gpg_key: https://lemonldap-ng.org/_media/rpm-gpg-key-ow2
tags: repo