Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Support for Debian 12 #129

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions tomcat/osfamilymap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
# vim: ft=yaml
---
Debian:
ver: 9
pkg: tomcat9
ver: 10
pkg: tomcat10
native_pkg: libtcnative-1
manager_pkg: tomcat9-admin
common_pkg: tomcat9-common
manager_pkg: tomcat10-admin
common_pkg: tomcat10-common
with_haveged: true
haveged_enabled: true
conf_dir: /etc/tomcat9
main_config: /etc/default/tomcat9
conf_dir: /etc/tomcat10
main_config: /etc/default/tomcat10
main_config_template: salt://tomcat/files/tomcat-default-Debian.template
service: tomcat9
service: tomcat10
user: tomcat
group: tomcat
java_home: /usr/lib/jvm/default-java
catalina_base: /var/lib/tomcat9
catalina_home: /usr/share/tomcat9
catalina_pid: /var/run/tomcat9.pid
catalina_tmpdir: /var/cache/tomcat9/temp
catalina_base: /var/lib/tomcat10
catalina_home: /usr/share/tomcat10
catalina_pid: /var/run/tomcat10.pid
catalina_tmpdir: /var/cache/tomcat10/temp

RedHat:
native_pkg: tomcat-native
Expand Down
44 changes: 43 additions & 1 deletion tomcat/osfingermap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,49 @@
# vim: ft=yaml
---
# os: Debian
Debian-10: {}
Debian-12:
java_opts:
- 'Djava.awt.headless=true'
- 'Xmx128m'
- 'XX:+UseConcMarkSweepGC'
Debian-11:
ver: 9
pkg: tomcat9
native_pkg: libtcnative-1
manager_pkg: tomcat9-admin
common_pkg: tomcat9-common
with_haveged: true
haveged_enabled: true
conf_dir: /etc/tomcat9
main_config: /etc/default/tomcat9
main_config_template: salt://tomcat/files/tomcat-default-Debian.template
service: tomcat9
user: tomcat
group: tomcat
java_home: /usr/lib/jvm/default-java
catalina_base: /var/lib/tomcat9
catalina_home: /usr/share/tomcat9
catalina_pid: /var/run/tomcat9.pid
catalina_tmpdir: /var/cache/tomcat9/temp
Debian-10:
ver: 9
pkg: tomcat9
native_pkg: libtcnative-1
manager_pkg: tomcat9-admin
common_pkg: tomcat9-common
with_haveged: true
haveged_enabled: true
conf_dir: /etc/tomcat9
main_config: /etc/default/tomcat9
main_config_template: salt://tomcat/files/tomcat-default-Debian.template
service: tomcat9
user: tomcat
group: tomcat
java_home: /usr/lib/jvm/default-java
catalina_base: /var/lib/tomcat9
catalina_home: /usr/share/tomcat9
catalina_pid: /var/run/tomcat9.pid
catalina_tmpdir: /var/cache/tomcat9/temp
Debian-9:
ver: 8
pkg: tomcat8
Expand Down
Loading