Compare commits
No commits in common. "c8-stream-10.6" and "stream-pki-core-10.6-rhel-8.9.0" have entirely different histories.
c8-stream-
...
stream-pki
|
@ -1 +1,2 @@
|
||||||
SOURCES/tomcatjss-7.8.0.tar.gz
|
SOURCES/tomcatjss-7.7.1.tar.gz
|
||||||
|
/tomcatjss-7.7.1.tar.gz
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
b866d5baa11685960fa00b600c33af1c2eab55e3 SOURCES/tomcatjss-7.8.0.tar.gz
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
REPO=$1
|
||||||
|
|
||||||
|
if [ "$REPO" == "" ]; then
|
||||||
|
REPO="pki-10.6"
|
||||||
|
fi
|
||||||
|
|
||||||
|
fedpkg copr-build --nowait $REPO
|
|
@ -0,0 +1,7 @@
|
||||||
|
# recipients: rhcs-team
|
||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-9
|
||||||
|
decision_context: osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
|
@ -0,0 +1 @@
|
||||||
|
SHA512 (tomcatjss-7.7.1.tar.gz) = dbec1d1090fe4640e967ae7631255a64e9c268a06b89bd1c07de0437b86c6be4749d3823d2f22bb4737ff361e79bc1611baa91dc92671c9cdf13d529288c0e62
|
|
@ -0,0 +1,7 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
SOURCE=$1
|
||||||
|
TARGET=`basename $1`
|
||||||
|
|
||||||
|
cp $SOURCE $TARGET
|
||||||
|
sha512sum --tag $TARGET > sources
|
|
@ -0,0 +1,25 @@
|
||||||
|
[DEFAULT]
|
||||||
|
pki_server_database_password=Secret.123
|
||||||
|
|
||||||
|
[CA]
|
||||||
|
pki_admin_email=caadmin@example.com
|
||||||
|
pki_admin_name=caadmin
|
||||||
|
pki_admin_nickname=caadmin
|
||||||
|
pki_admin_password=Secret.123
|
||||||
|
pki_admin_uid=caadmin
|
||||||
|
|
||||||
|
pki_client_database_password=Secret.123
|
||||||
|
pki_client_database_purge=False
|
||||||
|
pki_client_pkcs12_password=Secret.123
|
||||||
|
|
||||||
|
pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com
|
||||||
|
pki_ds_database=ca
|
||||||
|
pki_ds_password=Secret.123
|
||||||
|
|
||||||
|
pki_security_domain_name=EXAMPLE
|
||||||
|
|
||||||
|
pki_ca_signing_nickname=ca_signing
|
||||||
|
pki_ocsp_signing_nickname=ca_ocsp_signing
|
||||||
|
pki_audit_signing_nickname=ca_audit_signing
|
||||||
|
pki_sslserver_nickname=sslserver
|
||||||
|
pki_subsystem_nickname=subsystem
|
|
@ -0,0 +1,24 @@
|
||||||
|
#!/bin/bash -ex
|
||||||
|
|
||||||
|
# This command needs to be executed as it pulls the machine name
|
||||||
|
# dynamically.
|
||||||
|
dscreate create-template /tmp/test_dir/ds.inf
|
||||||
|
|
||||||
|
sed -i \
|
||||||
|
-e "s/;instance_name = .*/instance_name = localhost/g" \
|
||||||
|
-e "s/;root_password = .*/root_password = Secret.123/g" \
|
||||||
|
-e "s/;suffix = .*/suffix = dc=example,dc=com/g" \
|
||||||
|
-e "s/;self_sign_cert = .*/self_sign_cert = False/g" \
|
||||||
|
/tmp/test_dir/ds.inf
|
||||||
|
|
||||||
|
dscreate from-file /tmp/test_dir/ds.inf
|
||||||
|
|
||||||
|
ldapadd -h $HOSTNAME -x -D "cn=Directory Manager" -w Secret.123 << EOF
|
||||||
|
dn: dc=example,dc=com
|
||||||
|
objectClass: domain
|
||||||
|
dc: example
|
||||||
|
|
||||||
|
dn: dc=pki,dc=example,dc=com
|
||||||
|
objectClass: domain
|
||||||
|
dc: pki
|
||||||
|
EOF
|
|
@ -0,0 +1,27 @@
|
||||||
|
[DEFAULT]
|
||||||
|
pki_server_database_password=Secret.123
|
||||||
|
|
||||||
|
[KRA]
|
||||||
|
pki_admin_email=kraadmin@example.com
|
||||||
|
pki_admin_name=kraadmin
|
||||||
|
pki_admin_nickname=kraadmin
|
||||||
|
pki_admin_password=Secret.123
|
||||||
|
pki_admin_uid=kraadmin
|
||||||
|
|
||||||
|
pki_client_database_password=Secret.123
|
||||||
|
pki_client_database_purge=False
|
||||||
|
pki_client_pkcs12_password=Secret.123
|
||||||
|
|
||||||
|
pki_ds_base_dn=dc=kra,dc=pki,dc=example,dc=com
|
||||||
|
pki_ds_database=kra
|
||||||
|
pki_ds_password=Secret.123
|
||||||
|
|
||||||
|
pki_security_domain_name=EXAMPLE
|
||||||
|
pki_security_domain_user=caadmin
|
||||||
|
pki_security_domain_password=Secret.123
|
||||||
|
|
||||||
|
pki_storage_nickname=kra_storage
|
||||||
|
pki_transport_nickname=kra_transport
|
||||||
|
pki_audit_signing_nickname=kra_audit_signing
|
||||||
|
pki_sslserver_nickname=sslserver
|
||||||
|
pki_subsystem_nickname=subsystem
|
|
@ -0,0 +1,26 @@
|
||||||
|
---
|
||||||
|
|
||||||
|
- name: Install tomcatjss
|
||||||
|
dnf:
|
||||||
|
name: >
|
||||||
|
tomcatjss
|
||||||
|
|
||||||
|
- name: Install required packages
|
||||||
|
dnf:
|
||||||
|
name: >
|
||||||
|
389-ds-base, pki-ca, pki-kra
|
||||||
|
|
||||||
|
- name: Creates directory
|
||||||
|
file: path=/tmp/test_files state=directory
|
||||||
|
|
||||||
|
- name: Copying templates to /tmp folder
|
||||||
|
copy : src=. dest=/tmp/test_dir
|
||||||
|
|
||||||
|
- name: Setup DS Service
|
||||||
|
shell: sh /tmp/test_dir/ds-create.sh
|
||||||
|
|
||||||
|
- name: Install CA subsystem
|
||||||
|
shell: pkispawn -f /tmp/test_dir/ca.cfg -s CA -v
|
||||||
|
|
||||||
|
- name: Install KRA subsystem
|
||||||
|
shell: pkispawn -f /tmp/test_dir/kra.cfg -s KRA -v
|
|
@ -0,0 +1,30 @@
|
||||||
|
- hosts: localhost
|
||||||
|
remote_user: root
|
||||||
|
tags:
|
||||||
|
- classic
|
||||||
|
roles:
|
||||||
|
- role: Test_Setup
|
||||||
|
- role: standard-test-basic
|
||||||
|
tests:
|
||||||
|
- verify_spawn_ca:
|
||||||
|
dir: .
|
||||||
|
run: "curl http://localhost:8080/ca/admin/ca/getStatus | grep '<Status>running</Status>'"
|
||||||
|
- verify_spawn_kra:
|
||||||
|
dir: .
|
||||||
|
run: "curl http://localhost:8080/kra/admin/kra/getStatus | grep '<Status>running</Status>'"
|
||||||
|
- destroy_kra:
|
||||||
|
dir: .
|
||||||
|
run: "pkidestroy -i pki-tomcat -s KRA && sleep 5"
|
||||||
|
- verify_destroy_kra:
|
||||||
|
dir: .
|
||||||
|
run: "curl http://localhost:8080/kra/admin/kra/getStatus | grep 'HTTP Status 404'"
|
||||||
|
- destroy_ca:
|
||||||
|
dir: .
|
||||||
|
run: "pkidestroy -i pki-tomcat -s CA"
|
||||||
|
- verify_destroy_ca:
|
||||||
|
dir: .
|
||||||
|
run: "curl http://localhost:8080/ca/admin/ca/getStatus &> testfile.log || true && grep 'Connection refused' testfile.log"
|
||||||
|
required_packages:
|
||||||
|
- tomcatjss
|
||||||
|
- pki-ca
|
||||||
|
- pki-kra
|
|
@ -2,23 +2,15 @@
|
||||||
Name: tomcatjss
|
Name: tomcatjss
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
%global product_id idm-tomcatjss
|
|
||||||
|
|
||||||
# Upstream version number:
|
|
||||||
%global major_version 7
|
|
||||||
%global minor_version 8
|
|
||||||
%global update_version 0
|
|
||||||
|
|
||||||
Summary: JSS Connector for Apache Tomcat
|
Summary: JSS Connector for Apache Tomcat
|
||||||
URL: https://github.com/dogtagpki/tomcatjss
|
URL: http://www.dogtagpki.org/wiki/TomcatJSS
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
# For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
|
# For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
|
||||||
# For official (i.e. supported) releases, use x.y.z-r where r >=1.
|
# For official (i.e. supported) releases, use x.y.z-r where r >=1.
|
||||||
%global release_number 1
|
Version: 7.7.1
|
||||||
Version: %{major_version}.%{minor_version}.%{update_version}
|
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
|
||||||
Release: %{release_number}%{?_timestamp}%{?_commit_id}%{?dist}
|
|
||||||
#global _phase -alpha1
|
#global _phase -alpha1
|
||||||
|
|
||||||
# To generate the source tarball:
|
# To generate the source tarball:
|
||||||
|
@ -71,23 +63,19 @@ BuildRequires: slf4j
|
||||||
BuildRequires: slf4j-jdk14
|
BuildRequires: slf4j-jdk14
|
||||||
|
|
||||||
# JSS
|
# JSS
|
||||||
BuildRequires: jss >= 4.11.0, jss < 5.0.0
|
BuildRequires: jss >= 4.9.0, jss < 5.0.0
|
||||||
|
|
||||||
# Tomcat
|
# Tomcat
|
||||||
BuildRequires: tomcat
|
%if 0%{?rhel} && ! 0%{?eln}
|
||||||
|
BuildRequires: pki-servlet-engine >= 1:9.0.7
|
||||||
%description
|
%else
|
||||||
JSS Connector for Apache Tomcat, installed via the tomcatjss package,
|
BuildRequires: tomcat >= 1:9.0.7
|
||||||
is a Java Secure Socket Extension (JSSE) module for Apache Tomcat that
|
%endif
|
||||||
uses Java Security Services (JSS), a Java interface to Network Security
|
|
||||||
Services (NSS).
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
%package -n %{product_id}
|
# Runtime Dependencies
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
Summary: JSS Connector for Apache Tomcat
|
|
||||||
|
|
||||||
# Java
|
# Java
|
||||||
Requires: apache-commons-lang3
|
Requires: apache-commons-lang3
|
||||||
Requires: %{java_headless}
|
Requires: %{java_headless}
|
||||||
|
@ -98,15 +86,14 @@ Requires: slf4j
|
||||||
Requires: slf4j-jdk14
|
Requires: slf4j-jdk14
|
||||||
|
|
||||||
# JSS
|
# JSS
|
||||||
Requires: jss >= 4.11.0, jss < 5.0.0
|
Requires: jss >= 4.9.0, jss < 5.0.0
|
||||||
|
|
||||||
# Tomcat
|
# Tomcat
|
||||||
Requires: tomcat
|
%if 0%{?rhel} && ! 0%{?eln}
|
||||||
|
Requires: pki-servlet-engine >= 1:9.0.7
|
||||||
Obsoletes: tomcatjss < %{version}-%{release}
|
%else
|
||||||
Provides: tomcatjss = %{version}-%{release}
|
Requires: tomcat >= 1:9.0.7
|
||||||
Provides: tomcatjss = %{major_version}.%{minor_version}
|
%endif
|
||||||
Provides: %{product_id} = %{major_version}.%{minor_version}
|
|
||||||
|
|
||||||
# PKI
|
# PKI
|
||||||
Conflicts: pki-base < 10.10.0
|
Conflicts: pki-base < 10.10.0
|
||||||
|
@ -117,7 +104,7 @@ Conflicts: pki-base < 10.10.0
|
||||||
%define _sharedstatedir /var/lib
|
%define _sharedstatedir /var/lib
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description -n %{product_id}
|
%description
|
||||||
JSS Connector for Apache Tomcat, installed via the tomcatjss package,
|
JSS Connector for Apache Tomcat, installed via the tomcatjss package,
|
||||||
is a Java Secure Socket Extension (JSSE) module for Apache Tomcat that
|
is a Java Secure Socket Extension (JSSE) module for Apache Tomcat that
|
||||||
uses Java Security Services (JSS), a Java interface to Network Security
|
uses Java Security Services (JSS), a Java interface to Network Security
|
||||||
|
@ -141,12 +128,12 @@ ant -f build.xml \
|
||||||
-Dversion=%{version} \
|
-Dversion=%{version} \
|
||||||
-Dsrc.dir=$app_server \
|
-Dsrc.dir=$app_server \
|
||||||
-Djnidir=%{_jnidir} \
|
-Djnidir=%{_jnidir} \
|
||||||
-Dinstall.doc.dir=%{buildroot}%{_docdir}/%{product_id} \
|
-Dinstall.doc.dir=%{buildroot}%{_docdir}/%{name} \
|
||||||
-Dinstall.jar.dir=%{buildroot}%{_javadir} \
|
-Dinstall.jar.dir=%{buildroot}%{_javadir} \
|
||||||
install
|
install
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
%files -n %{product_id}
|
%files
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
|
@ -158,15 +145,6 @@ ant -f build.xml \
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Feb 08 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 7.8.0-1
|
|
||||||
- Rebase to TomcatJSS 7.8.0
|
|
||||||
|
|
||||||
* Tue Jan 16 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 7.8.0-0.1
|
|
||||||
- Rebase to TomcatJSS 7.8.0-alpha1
|
|
||||||
|
|
||||||
* Mon Jan 15 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 7.7.3-1
|
|
||||||
- Replace pki-servlet-engine with tomcat
|
|
||||||
|
|
||||||
* Mon Nov 15 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 7.7.1-1
|
* Mon Nov 15 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 7.7.1-1
|
||||||
- Rebase to TomcatJSS 7.7.1
|
- Rebase to TomcatJSS 7.7.1
|
||||||
|
|
Loading…
Reference in New Issue