Merge pull request #120 from myii/bug/fix-debian-9-regression

fix(osfingermap): reinstate values for `Debian-9` after regression
saltstack-formulas · Dec 18, 2020 · 9cc205d · 9cc205d
2 parents 85ca524 + 5170561
commit 9cc205d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -117,7 +117,7 @@ default-fedora-32-master-py3: {extends: '.test_instance'}
 # default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
 # default-amazonlinux-2-master-py3: {extends: '.test_instance'}
 # default-debian-10-3000-3-py3: {extends: '.test_instance'}
-# default-debian-9-3000-3-py3: {extends: '.test_instance'}
+default-debian-9-3000-3-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-3000-3-py3: {extends: '.test_instance'}
 # default-centos-8-3000-3-py3: {extends: '.test_instance'}
 # default-centos-7-3000-3-py3: {extends: '.test_instance'}

diff --git a/.travis.yml b/.travis.yml
@@ -92,7 +92,7 @@ jobs:
     # - env: INSTANCE=default-opensuse-leap-152-master-py3
     # - env: INSTANCE=default-amazonlinux-2-master-py3
     # - env: INSTANCE=default-debian-10-3000-3-py3
-    # - env: INSTANCE=default-debian-9-3000-3-py3
+    - env: INSTANCE=default-debian-9-3000-3-py3
     # - env: INSTANCE=default-ubuntu-1804-3000-3-py3
     # - env: INSTANCE=default-centos-8-3000-3-py3
     # - env: INSTANCE=default-centos-7-3000-3-py3

diff --git a/tomcat/osfingermap.yaml b/tomcat/osfingermap.yaml
@@ -15,7 +15,20 @@ Debian-10:
   catalina_home: /usr/share/tomcat9
   catalina_pid: /var/run/tomcat9.pid
   catalina_tmpdir: /var/cache/tomcat9/temp
-Debian-9: {}
+Debian-9:
+  ver: 8
+  pkg: tomcat8
+  manager_pkg: tomcat8-admin
+  conf_dir: /etc/tomcat8
+  main_config: /etc/default/tomcat8
+  service: tomcat8
+  user: tomcat8
+  group: tomcat8
+  catalina_base: /var/lib/tomcat8
+  catalina_home: /usr/share/tomcat8
+  catalina_pid: /var/run/tomcat8.pid
+  catalina_tmpdir: /var/cache/tomcat8/temp
+  common_pkg: tomcat8-common
 Debian-8:
   ver: 7
   pkg: tomcat7