diff options
author | Christina Fu <cfu@redhat.com> | 2012-08-15 13:32:14 -0700 |
---|---|---|
committer | Christina Fu <cfu@redhat.com> | 2012-08-15 13:32:14 -0700 |
commit | 7a5b5b06052a3432e1aec0aec8906cd5941f6fd9 (patch) | |
tree | 052bc470521dc24b5aa0b3552e594dbe11a4d660 /base/setup/pkicreate | |
parent | 3b1ca60d799ca02305b8a2c61eb279f74787cff0 (diff) | |
parent | 7a6b89591732f872db38821c00ec3ce89ef57e7a (diff) | |
download | pki-7a5b5b06052a3432e1aec0aec8906cd5941f6fd9.tar.gz pki-7a5b5b06052a3432e1aec0aec8906cd5941f6fd9.tar.xz pki-7a5b5b06052a3432e1aec0aec8906cd5941f6fd9.zip |
Merge branch 'master' of git://git.fedorahosted.org/git/pki
Diffstat (limited to 'base/setup/pkicreate')
-rwxr-xr-x | base/setup/pkicreate | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/base/setup/pkicreate b/base/setup/pkicreate index cc4ee703f..e3ee5a0ab 100755 --- a/base/setup/pkicreate +++ b/base/setup/pkicreate @@ -2870,6 +2870,17 @@ sub process_pki_files_and_symlinks "${db_password}\n", $default_file_permissions, $pki_user, $pki_group); + ## Populate systemd links + if ($use_systemd) { + return 0 if !create_symlink( + "${pki_subsystem_systemd_wants_path}/${pki_instance_systemd_service_name}", + "$pki_subsystem_systemd_service_path", + $root_user, $root_group); + + # reload systemd configuration + run_command("/bin/systemctl --system daemon-reload"); + } + ## Populate instances (RA, TPS instances) if ($subsystem_type eq $RA || $subsystem_type eq $TPS) { # create an empty file called "pwcache.conf" for this @@ -2893,16 +2904,6 @@ sub process_pki_files_and_symlinks # to find our tomcat6 configuration file in /etc/sysconfig return 0 if !create_symlink($pki_instance_initscript_path, $tomcat6_initscript_path, $root_user, $root_group); - if ($use_systemd) { - return 0 if !create_symlink( - "${pki_subsystem_systemd_wants_path}/${pki_instance_systemd_service_name}", - "$pki_subsystem_systemd_service_path", - $root_user, $root_group); - - # reload systemd configuration - run_command("/bin/systemctl --system daemon-reload"); - - } return 0 if !create_directory($webinf_lib_instance_path, $default_dir_permissions, $pki_user, $pki_group); |