[Pkg-freeipa-devel] [Git][freeipa-team/dogtag-pki][master-next] 5 commits: ci: Disable reprotest, it gets stuck and times out.
Timo Aaltonen
gitlab at salsa.debian.org
Fri Aug 14 06:51:47 BST 2020
Timo Aaltonen pushed to branch master-next at FreeIPA packaging / dogtag-pki
Commits:
f1d0bb60 by Timo Aaltonen at 2020-08-14T06:38:06+03:00
ci: Disable reprotest, it gets stuck and times out.
- - - - -
cc444158 by Timo Aaltonen at 2020-08-14T07:26:02+03:00
fold a patch in debian-support.diff
- - - - -
6c50cb77 by Timo Aaltonen at 2020-08-14T07:29:54+03:00
create-target-wants.diff: Add an entry to the log if this is triggered.
- - - - -
eb2173e8 by Timo Aaltonen at 2020-08-14T07:40:45+03:00
debian-support.diff: Fix more hardcodings of /etc/sysconfig.
- - - - -
3acf2a5e by Timo Aaltonen at 2020-08-14T08:51:29+03:00
Add a debianized service file for pki-tomcatd-nuxwdog.
- - - - -
8 changed files:
- debian/changelog
- debian/gitlab-ci.yml
- debian/patches/create-target-wants.diff
- debian/patches/debian-support.diff
- − debian/patches/fix-upgrade-script.diff
- debian/patches/series
- + debian/pki-server.pki-tomcatd-nuxwdog at .service
- debian/pki-server.pki-tomcatd at .service
Changes:
=====================================
debian/changelog
=====================================
@@ -3,12 +3,15 @@ dogtag-pki (10.9.1-1) UNRELEASED; urgency=medium
* New upstream release.
* fix-javadoc-build.diff: Dropped, upstream.
* server.install: Updated.
- * fix-upgrade-script.diff: Fix hardcoding /etc/sysconfig on an upgrade
- script.
+ * debian-support.diff: Fix more hardcodings of /etc/sysconfig.
* patches: Refreshed.
* rules: Set PKI_JAVA_PATH.
* rules: Drop obsolete WITH_PYTHON options.
* revert-support-jdk8-jdk11-rpm-builds.diff: This commit breaks the java path.
+ * ci: Disable reprotest, it gets stuck and times out.
+ * create-target-wants.diff: Add an entry to the log if this is
+ triggered.
+ * Add a debianized service file for pki-tomcatd-nuxwdog.
-- Timo Aaltonen <tjaalton at debian.org> Wed, 01 Jul 2020 07:06:06 +0300
=====================================
debian/gitlab-ci.yml
=====================================
@@ -2,6 +2,9 @@ include:
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+variables:
+ SALSA_CI_DISABLE_REPROTEST: 1
+
blhc:
allow_failure: true
=====================================
debian/patches/create-target-wants.diff
=====================================
@@ -1,11 +1,12 @@
--- a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
+++ b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
-@@ -257,6 +257,10 @@ class PkiScriptlet(pkiscriptlet.Abstract
+@@ -257,6 +257,11 @@ class PkiScriptlet(pkiscriptlet.Abstract
deployer.mdict['pki_instance_log_path'],
deployer.mdict['pki_instance_logs_link'])
+ # create instance target.wants directory if necessary
+ if not os.path.exists(deployer.mdict['pki_systemd_target_wants']):
++ logger.info('Creating pki_systemd_target_wants')
+ os.mkdir(deployer.mdict['pki_systemd_target_wants'])
+
# create Tomcat instance systemd service link
=====================================
debian/patches/debian-support.diff
=====================================
@@ -92,6 +92,15 @@ Description: changes for Debian
got_use_nuxwdog = False
+@@ -288,7 +288,7 @@ class NuxwdogDisableCLI(pki.cli.CLI):
+ self.modify_password_class_in_cs_cfg(instance)
+
+ def disable_nuxwdog_sysconfig_file(self, instance):
+- sysconfig_file = os.path.join('/etc/sysconfig', instance.name)
++ sysconfig_file = os.path.join('/etc/default', instance.name)
+
+ for line in fileinput.input(sysconfig_file, inplace=1):
+
--- a/base/common/share/etc/pki.conf
+++ b/base/common/share/etc/pki.conf
@@ -15,7 +15,7 @@ PKI_JAVA_PATH=${Java_JAVA_EXECUTABLE}
@@ -136,3 +145,25 @@ Description: changes for Debian
The following parameters are queried interactively during the installation process.
+--- a/base/server/upgrade/10.9.0/03-DisableOpenJDKFIPS.py
++++ b/base/server/upgrade/10.9.0/03-DisableOpenJDKFIPS.py
+@@ -21,7 +21,7 @@ class DisableOpenJDKFIPS(pki.server.upgr
+
+ def upgrade_instance(self, instance):
+ self.fix_tomcat_config('/etc/pki/%s/tomcat.conf' % instance.name)
+- self.fix_tomcat_config('/etc/sysconfig/%s' % instance.name)
++ self.fix_tomcat_config('/etc/default/%s' % instance.name)
+
+ def fix_tomcat_config(self, filename):
+ if not os.path.exists(filename):
+--- a/base/server/python/pki/server/instance.py
++++ b/base/server/python/pki/server/instance.py
+@@ -878,7 +878,7 @@ class PKIServerFactory(object):
+ instance_type = parts[0]
+ instance_name = parts[1]
+
+- sysconfig_file = os.path.join('/etc/sysconfig', instance_name)
++ sysconfig_file = os.path.join('/etc/default', instance_name)
+
+ if os.path.isfile(sysconfig_file):
+
=====================================
debian/patches/fix-upgrade-script.diff deleted
=====================================
@@ -1,13 +0,0 @@
-diff --git a/base/server/upgrade/10.9.0/03-DisableOpenJDKFIPS.py b/base/server/upgrade/10.9.0/03-DisableOpenJDKFIPS.py
-index dcf2db30d..0771589dc 100644
---- a/base/server/upgrade/10.9.0/03-DisableOpenJDKFIPS.py
-+++ b/base/server/upgrade/10.9.0/03-DisableOpenJDKFIPS.py
-@@ -21,7 +21,7 @@ class DisableOpenJDKFIPS(pki.server.upgrade.PKIServerUpgradeScriptlet):
-
- def upgrade_instance(self, instance):
- self.fix_tomcat_config('/etc/pki/%s/tomcat.conf' % instance.name)
-- self.fix_tomcat_config('/etc/sysconfig/%s' % instance.name)
-+ self.fix_tomcat_config('/etc/default/%s' % instance.name)
-
- def fix_tomcat_config(self, filename):
- if not os.path.exists(filename):
=====================================
debian/patches/series
=====================================
@@ -15,5 +15,4 @@ fix-tomcat-paths.diff
fix-tomcat-jars.diff
fix-hamcrest-jar.diff
fix-healthcheck-install.diff
-fix-upgrade-script.diff
revert-support-jdk8-jdk11-rpm-builds.diff
=====================================
debian/pki-server.pki-tomcatd-nuxwdog at .service
=====================================
@@ -0,0 +1,32 @@
+[Unit]
+Description=PKI Tomcat Server %i Started by Nuxwdog
+PartOf=pki-tomcatd-nuxwdog.target
+
+[Service]
+Type=simple
+EnvironmentFile=/usr/share/pki/etc/tomcat.conf
+Environment="CATALINA_HOME=/usr/share/tomcat9"
+Environment="NAME=%i"
+Environment="STARTED_BY_SYSTEMD=1"
+Environment="WD_PIPE_NAME=%i"
+EnvironmentFile=-/etc/default/%i
+
+ExecStartPre=+/usr/bin/setfacl -m u:pkiuser:wx /run/systemd/ask-password
+ExecStartPre=/usr/bin/pki-server-nuxwdog
+ExecStartPre=/usr/sbin/pki-server upgrade %i
+ExecStartPre=/usr/sbin/pki-server migrate %i --tomcat 9.0.00
+ExecStartPre=/usr/bin/pkidaemon start %i
+ExecStartPost=+/usr/bin/setfacl -x u:pkiuser /run/systemd/ask-password
+ExecStart=/bin/sh /usr/share/pki/tomcat-start.sh
+ExecStopPost=/usr/bin/pki-server-nuxwdog --clear
+
+KeyringMode=shared
+SuccessExitStatus=143
+TimeoutStartSec=180
+SyslogIdentifier=%i
+User=pkiuser
+Group=pkiuser
+Restart=on-failure
+
+[Install]
+WantedBy=pki-tomcatd-nuxwdog.target
=====================================
debian/pki-server.pki-tomcatd at .service
=====================================
@@ -8,11 +8,13 @@ EnvironmentFile=/usr/share/pki/etc/tomcat.conf
Environment="CATALINA_HOME=/usr/share/tomcat9"
Environment="NAME=%i"
EnvironmentFile=-/etc/default/%i
+
ExecStartPre=/usr/sbin/pki-server upgrade %i
ExecStartPre=/usr/sbin/pki-server migrate %i --tomcat 9.0.00
ExecStartPre=/usr/bin/pkidaemon start %i
#ExecStartPre=+/usr/libexec/tomcat9/tomcat-update-policy.sh
ExecStart=/bin/sh /usr/share/pki/tomcat-start.sh
+
SuccessExitStatus=143
SyslogIdentifier=%i
User=pkiuser
View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/-/compare/f8bb6c7abfd612e5c5f8edeb668dc5ffe8ce8aa8...3acf2a5e42a210d62fd639992f6af2d0887030a0
--
View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/-/compare/f8bb6c7abfd612e5c5f8edeb668dc5ffe8ce8aa8...3acf2a5e42a210d62fd639992f6af2d0887030a0
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/20200814/8a92e0da/attachment-0001.html>
More information about the Pkg-freeipa-devel
mailing list