summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-10-03 19:09:08 -0500
committerAde Lee <alee@redhat.com>2012-10-07 23:53:23 -0400
commit79a3d828d4851afb66e3c18b812ae31171c39a6e (patch)
tree6eca485f9750dcc0688bc87d0e195ffa38af903c
parentda73f97ee897782a4e8fc326cd428bcd7ba5fd31 (diff)
downloadpki-79a3d828d4851afb66e3c18b812ae31171c39a6e.zip
pki-79a3d828d4851afb66e3c18b812ae31171c39a6e.tar.gz
pki-79a3d828d4851afb66e3c18b812ae31171c39a6e.tar.xz
Renamed "shared" folder to "server".
The "shared" folder in /usr/share/pki has been renamed to "server" since it contains only server files. Ticket #353
-rw-r--r--base/common/CMakeLists.txt2
-rw-r--r--base/deploy/src/scriptlets/instance_layout.py8
-rw-r--r--base/deploy/src/scriptlets/pkiparser.py18
-rw-r--r--specs/pki-core.spec11
4 files changed, 19 insertions, 20 deletions
diff --git a/base/common/CMakeLists.txt b/base/common/CMakeLists.txt
index 1a308eb..c4a4b1d 100644
--- a/base/common/CMakeLists.txt
+++ b/base/common/CMakeLists.txt
@@ -31,7 +31,7 @@ install(
DIRECTORY
shared/
DESTINATION
- ${DATA_INSTALL_DIR}/shared/
+ ${DATA_INSTALL_DIR}/server/
PATTERN
"lib/*" EXCLUDE
)
diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py
index 5b48b87..2f79de8 100644
--- a/base/deploy/src/scriptlets/instance_layout.py
+++ b/base/deploy/src/scriptlets/instance_layout.py
@@ -46,7 +46,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
# establish Apache/Tomcat specific instance
if master['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS:
# establish Tomcat instance configuration
- util.directory.copy(master['pki_source_shared_path'],
+ util.directory.copy(master['pki_source_server_path'],
master['pki_instance_configuration_path'],
overwrite_flag=True)
# establish Tomcat instance base
@@ -77,7 +77,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
util.directory.copy(
os.path.join(
config.PKI_DEPLOYMENT_SOURCE_ROOT,
- "shared",
+ "server",
"webapps",
"ROOT"),
master['pki_tomcat_webapps_root_path'],
@@ -185,7 +185,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
util.directory.copy(
os.path.join(
config.PKI_DEPLOYMENT_SOURCE_ROOT,
- "shared",
+ "server",
"webapps",
"ROOT"),
master['pki_tomcat_webapps_root_path'],
@@ -244,7 +244,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
# update instance convenience symbolic links
util.symlink.modify(master['pki_instance_database_link'])
util.symlink.modify(master['pki_instance_conf_link'])
- util.directory.copy(master['pki_source_shared_path'],
+ util.directory.copy(master['pki_source_server_path'],
master['pki_instance_configuration_path'],
overwrite_flag=True)
util.symlink.modify(master['pki_instance_logs_link'])
diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlets/pkiparser.py
index a349436..cb41903 100644
--- a/base/deploy/src/scriptlets/pkiparser.py
+++ b/base/deploy/src/scriptlets/pkiparser.py
@@ -358,9 +358,9 @@ def compose_pki_master_dictionary():
config.pki_master_dict['pki_source_setup_path'] =\
os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT,
"setup")
- config.pki_master_dict['pki_source_shared_path'] =\
+ config.pki_master_dict['pki_source_server_path'] =\
os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT,
- "shared",
+ "server",
"conf")
config.pki_master_dict['pki_source_cs_cfg'] =\
os.path.join(config.pki_master_dict['pki_source_conf_path'],
@@ -406,24 +406,20 @@ def compose_pki_master_dictionary():
"lib")
config.pki_master_dict['pki_tomcat_systemd'] =\
config.PKI_DEPLOYMENT_TOMCAT_SYSTEMD
- config.pki_master_dict['pki_shared_webapps_path'] =\
- os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT,
- "shared",
- "webapps")
config.pki_master_dict['pki_source_catalina_properties'] =\
- os.path.join(config.pki_master_dict['pki_source_shared_path'],
+ os.path.join(config.pki_master_dict['pki_source_server_path'],
"catalina.properties")
config.pki_master_dict['pki_source_servercertnick_conf'] =\
- os.path.join(config.pki_master_dict['pki_source_shared_path'],
+ os.path.join(config.pki_master_dict['pki_source_server_path'],
"serverCertNick.conf")
config.pki_master_dict['pki_source_server_xml'] =\
- os.path.join(config.pki_master_dict['pki_source_shared_path'],
+ os.path.join(config.pki_master_dict['pki_source_server_path'],
"server.xml")
config.pki_master_dict['pki_source_context_xml'] =\
- os.path.join(config.pki_master_dict['pki_source_shared_path'],
+ os.path.join(config.pki_master_dict['pki_source_server_path'],
"context.xml")
config.pki_master_dict['pki_source_tomcat_conf'] =\
- os.path.join(config.pki_master_dict['pki_source_shared_path'],
+ os.path.join(config.pki_master_dict['pki_source_server_path'],
"tomcat.conf")
if config.pki_master_dict['pki_subsystem'] == "CA":
config.pki_master_dict['pki_source_emails'] =\
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 9452f1b..0f4ff23 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -14,7 +14,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Name: pki-core
Version: 10.0.0
-Release: %{?relprefix}38%{?prerel}%{?dist}
+Release: %{?relprefix}39%{?prerel}%{?dist}
Summary: Certificate System - PKI Core Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -740,7 +740,7 @@ echo "D /var/run/pki/tks 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfil
%{__rm} -rf %{buildroot}%{_unitdir}
%endif
-%{__rm} -rf %{buildroot}%{_datadir}/pki/shared/lib
+%{__rm} -rf %{buildroot}%{_datadir}/pki/server/lib
# tomcat6 has changed how TOMCAT_LOG is used.
# Need to adjust accordingly
@@ -1175,8 +1175,8 @@ fi
%endif
%{_datadir}/pki/setup/
-%dir %{_datadir}/pki/shared
-%{_datadir}/pki/shared/
+%dir %{_datadir}/pki/server
+%{_datadir}/pki/server/
%files -n pki-selinux
@@ -1317,6 +1317,9 @@ fi
%changelog
+* Fri Oct 5 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.39.a2
+- Renamed "shared" folder to "server".
+
* Fri Oct 5 2012 Ade Lee <alee@redhat.com> 10.0.0-0.38.a2
- Added required selinux versions for new policy.