[Pkg-freeipa-devel] [Git][freeipa-team/dogtag-pki][master] 3 commits: Add pki.conf to service file environment.

[Timo Aaltonen]

Timo Aaltonen pushed to branch master at FreeIPA packaging / dogtag-pki


Commits:
63d52f99 by Timo Aaltonen at 2020-09-15T15:24:45+03:00
Add pki.conf to service file environment.

- - - - -
d35ac467 by Timo Aaltonen at 2020-09-15T15:27:04+03:00
control: Bump dependency on libjss-java.

- - - - -
bc203bce by Timo Aaltonen at 2020-09-15T16:33:47+03:00
Update gbp.conf.

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/gbp.conf
- debian/pki-server.pki-tomcatd-nuxwdog at .service
- debian/pki-server.pki-tomcatd at .service


Changes:

=====================================
debian/changelog
=====================================
@@ -9,6 +9,8 @@ dogtag-pki (10.9.4-1) UNRELEASED; urgency=medium
   * rules: Add more cruft to remove on dh_auto_clean.
   * revert-support-jdk8-jdk11-rpm-builds.diff: Dropped, fix PKI_JAVA_PATH
     instead.
+  * Add pki.conf to service file environment.
+  * control: Bump dependency on libjss-java.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Tue, 25 Aug 2020 07:48:17 +0300
 


=====================================
debian/control
=====================================
@@ -26,7 +26,7 @@ Build-Depends:
  libjackson2-core-java,
  libjackson2-databind-java,
  libjaxb-java,
- libjss-java (>= 4.7.0~),
+ libjss-java (>= 4.7.3~),
  libldap-java (>= 4.21.0+dfsg1),
  libldap2-dev,
  libnspr4-dev,
@@ -118,7 +118,7 @@ Depends:
  libhttpclient-java,
  libhttpcore-java,
  libjettison-java,
- libjss-java (>= 4.7.0~),
+ libjss-java (>= 4.7.3~),
  libldap-java (>= 4.21.0+dfsg1),
  libresteasy3.0-java (>= 3.0.19-5),
  libservlet3.1-java,


=====================================
debian/gbp.conf
=====================================
@@ -1,8 +1,8 @@
 [DEFAULT]
 # the default branch for upstream sources:
-upstream-branch = upstream-next
+upstream-branch = upstream
 upstream-tree = branch
 # the default branch for the debian patch:
-debian-branch = master-next
+debian-branch = master
 # use pristine-tar:
 pristine-tar = False


=====================================
debian/pki-server.pki-tomcatd-nuxwdog at .service
=====================================
@@ -10,6 +10,8 @@ Environment="NAME=%i"
 Environment="STARTED_BY_SYSTEMD=1"
 Environment="WD_PIPE_NAME=%i"
 EnvironmentFile=-/etc/default/%i
+EnvironmentFile=/usr/share/pki/etc/pki.conf
+EnvironmentFile=/etc/pki/pki.conf
 
 ExecStartPre=+/usr/bin/setfacl -m u:pkiuser:wx /run/systemd/ask-password
 ExecStartPre=/usr/bin/pki-server-nuxwdog


=====================================
debian/pki-server.pki-tomcatd at .service
=====================================
@@ -8,6 +8,8 @@ EnvironmentFile=/usr/share/pki/etc/tomcat.conf
 Environment="CATALINA_HOME=/usr/share/tomcat9"
 Environment="NAME=%i"
 EnvironmentFile=-/etc/default/%i
+EnvironmentFile=/usr/share/pki/etc/pki.conf
+EnvironmentFile=/etc/pki/pki.conf
 
 ExecStartPre=/usr/sbin/pki-server upgrade %i
 ExecStartPre=/usr/sbin/pki-server migrate %i --tomcat 9.0.00



View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/-/compare/d2424243d77b68578e41ebf3b459ceb748ff7fce...bc203bce25347b812f6ee9e63dbad8ae353f1745

-- 
View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/-/compare/d2424243d77b68578e41ebf3b459ceb748ff7fce...bc203bce25347b812f6ee9e63dbad8ae353f1745
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/20200915/acb42cee/attachment-0001.html>