[Pkg-freeipa-devel] [Git][freeipa-team/dogtag-pki][master] 6 commits: tomcat-start.sh: Dropped everything we don't need from the original copy from tomcat9.
Timo Aaltonen
gitlab at salsa.debian.org
Tue Sep 17 16:19:19 BST 2019
Timo Aaltonen pushed to branch master at FreeIPA packaging / dogtag-pki
Commits:
6fce2984 by Timo Aaltonen at 2019-09-16T15:10:29Z
tomcat-start.sh: Dropped everything we don't need from the original copy from tomcat9.
- - - - -
47c6072d by Timo Aaltonen at 2019-09-16T15:16:21Z
debian-support.diff: Drop the hunk about disabling pki_security_manager, it works fine with defaults.
- - - - -
09399aca by Timo Aaltonen at 2019-09-16T15:16:48Z
control: Bump pki-base-java dep on libjss-java.
- - - - -
2c9a2101 by Timo Aaltonen at 2019-09-17T15:13:49Z
fix-tomcat-paths.diff: Cleanups.
- - - - -
23b45ac9 by Timo Aaltonen at 2019-09-17T15:18:33Z
tests: Redirect dscreate stderr to stdout.
- - - - -
79b3d2f6 by Timo Aaltonen at 2019-09-17T15:19:00Z
releasing package dogtag-pki version 10.7.3-4
- - - - -
6 changed files:
- debian/changelog
- debian/control
- debian/patches/debian-support.diff
- debian/patches/fix-tomcat-paths.diff
- debian/tests/pkispawn
- debian/tomcat-start.sh
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+dogtag-pki (10.7.3-4) unstable; urgency=medium
+
+ * tomcat-start.sh: Dropped everything we don't need from the original
+ copy from tomcat9.
+ * debian-support.diff: Drop the hunk about disabling
+ pki_security_manager, it works fine with defaults.
+ * control: Bump pki-base-java dep on libjss-java.
+ * fix-tomcat-paths.diff: Cleanups.
+ * tests: Redirect dscreate stderr to stdout.
+
+ -- Timo Aaltonen <tjaalton at debian.org> Tue, 17 Sep 2019 18:18:35 +0300
+
dogtag-pki (10.7.3-3) unstable; urgency=medium
* fix-tomcat-paths.diff: We have /etc/default/tomcat9 instead of
=====================================
debian/control
=====================================
@@ -111,7 +111,7 @@ Depends:
libhttpclient-java,
libhttpcore-java,
libjettison-java,
- libjss-java (>= 4.6.0),
+ libjss-java (>= 4.6.1-3),
libldap-java (>= 4.21.0+dfsg1),
libresteasy3.0-java (>= 3.0.19-5),
libservlet3.1-java,
=====================================
debian/patches/debian-support.diff
=====================================
@@ -16,15 +16,6 @@ Description: changes for Debian
pki_instance_path=%(pki_path)s/%(pki_instance_name)s
pki_instance_log_path=%(pki_log_path)s/%(pki_instance_name)s
pki_instance_configuration_path=%(pki_configuration_path)s/%(pki_instance_name)s
-@@ -263,7 +263,7 @@ pki_enable_on_system_boot=True
- pki_enable_proxy=False
- pki_proxy_http_port=80
- pki_proxy_https_port=443
--pki_security_manager=true
-+pki_security_manager=false
- pki_tomcat_server_port=8005
-
- # Paths
@@ -279,11 +279,11 @@ pki_cgroup_systemd_service=%(pki_cgroup_
pki_cgroup_cpu_systemd_service_path=/sys/fs/cgroup/cpu\,cpuacct/system/%(pki_systemd_service)s
pki_cgroup_cpu_systemd_service=%(pki_cgroup_cpu_systemd_service_path)s/%(pki_systemd_service)s
@@ -61,7 +52,7 @@ Description: changes for Debian
def __init__(self,
--- a/base/server/python/pki/server/deployment/pkiparser.py
+++ b/base/server/python/pki/server/deployment/pkiparser.py
-@@ -758,7 +758,7 @@ class PKIConfigParser:
+@@ -764,7 +764,7 @@ class PKIConfigParser:
self.mdict['pki_instance_configuration_path'],
"context.xml")
self.mdict['pki_target_tomcat_conf_instance_id'] = \
@@ -70,7 +61,7 @@ Description: changes for Debian
self.mdict['pki_instance_name']
self.mdict['pki_target_tomcat_conf'] = \
os.path.join(
-@@ -1306,7 +1306,7 @@ class PKIConfigParser:
+@@ -1312,7 +1312,7 @@ class PKIConfigParser:
instance_root = os.path.join('/var/lib/pki', instance_name)
if not os.path.exists(instance_root):
return data
=====================================
debian/patches/fix-tomcat-paths.diff
=====================================
@@ -37,21 +37,28 @@
--- a/base/server/python/pki/server/__init__.py
+++ b/base/server/python/pki/server/__init__.py
-@@ -60,12 +60,12 @@ parser = etree.XMLParser(remove_blank_te
- class Tomcat(object):
+@@ -61,11 +61,11 @@ class Tomcat(object):
BASE_DIR = '/var/lib/tomcats'
-- CONF_DIR = '/etc/tomcat'
+ CONF_DIR = '/etc/tomcat'
- LIB_DIR = '/usr/share/java/tomcat'
- SHARE_DIR = '/usr/share/tomcat'
-+ CONF_DIR = '/etc/tomcat9'
+ LIB_DIR = '/usr/share/java'
+ SHARE_DIR = '/usr/share/tomcat9'
EXECUTABLE = '/usr/sbin/tomcat'
-- UNIT_FILE = '/lib/systemd/system/tomcat at .service'
+ UNIT_FILE = '/lib/systemd/system/tomcat at .service'
- TOMCAT_CONF = CONF_DIR + '/tomcat.conf'
-+ UNIT_FILE = '/lib/systemd/system/tomcat9.service'
-+ TOMCAT_CONF = '/etc/default/tomcat9'
++ TOMCAT_CONF = '/dev/null'
@classmethod
def get_version(cls):
+--- a/base/server/scripts/operations
++++ b/base/server/scripts/operations
+@@ -926,7 +926,6 @@ EOF
+
+ # Generate catalina.policy dynamically.
+ cat /usr/share/pki/server/conf/catalina.policy \
+- /usr/share/tomcat/conf/catalina.policy \
+ /var/lib/pki/$PKI_INSTANCE_NAME/conf/pki.policy \
+ /var/lib/pki/$PKI_INSTANCE_NAME/conf/custom.policy > \
+ /var/lib/pki/$PKI_INSTANCE_NAME/conf/catalina.policy
=====================================
debian/tests/pkispawn
=====================================
@@ -20,7 +20,7 @@ echo "$IP $HOSTNAME.debci $HOSTNAME" >> /etc/hosts
echo ">>>> /etc/hosts now has:"
cat /etc/hosts
-/usr/sbin/dscreate from-file debian/tests/debci.inf
+/usr/sbin/dscreate from-file debian/tests/debci.inf 2>&1
for subsys in CA KRA OCSP TKS; do
pkispawn -s $subsys -f debian/tests/deploy.cfg
=====================================
debian/tomcat-start.sh
=====================================
@@ -1,22 +1,9 @@
#!/bin/sh
#
-# Startup script for Apache Tomcat with systemd
+# Startup script for PKI Tomcat with systemd
#
set -e
-# Find the Java runtime and set JAVA_HOME
-. /usr/libexec/tomcat9/tomcat-locate-java.sh
-
-# Set the JSP compiler if configured in the /etc/default/tomcat9 file
-[ -n "$JSP_COMPILER" ] && JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=\"$JSP_COMPILER\""
-
-export JAVA_OPTS
-
-# Enable the Java security manager?
-SECURITY=""
-[ "$TOMCAT_SECURITY" = "yes" ] && SECURITY="-security"
-
-
# Start Tomcat
-cd $CATALINA_BASE && exec $CATALINA_HOME/bin/catalina.sh run $SECURITY
+cd $CATALINA_BASE && exec $CATALINA_HOME/bin/catalina.sh run
View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/compare/0ade35164cd92a72cded27849d0f8379be291ed8...79b3d2f6fb531e1e3ddb380c197612493c69250c
--
View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/compare/0ade35164cd92a72cded27849d0f8379be291ed8...79b3d2f6fb531e1e3ddb380c197612493c69250c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20190917/f7a0adb2/attachment-0001.html>
More information about the Pkg-freeipa-devel
mailing list