diff options
| author | Ade Lee <alee@redhat.com> | 2012-07-31 00:45:47 -0400 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2012-07-31 16:36:04 -0400 |
| commit | cff349cd4d2175eb920f9cab4998b4c3bfd0550a (patch) | |
| tree | 4ee12431333099858ae463aed8cb6d126b111bf3 /base/deploy | |
| parent | f589cc1e267d6d7b67a6463b4495b7a9c982669f (diff) | |
| download | pki-cff349cd4d2175eb920f9cab4998b4c3bfd0550a.tar.gz pki-cff349cd4d2175eb920f9cab4998b4c3bfd0550a.tar.xz pki-cff349cd4d2175eb920f9cab4998b4c3bfd0550a.zip | |
selinux policy changes to use standard ports
Selinux policy has been changed to use standard tomcat ports. Corresponding
changes have been made in the pki-deploy scripts.
Minor change in config script for password check.
Diffstat (limited to 'base/deploy')
| -rw-r--r-- | base/deploy/src/scriptlets/pkiconfig.py | 2 | ||||
| -rw-r--r-- | base/deploy/src/scriptlets/pkihelper.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/base/deploy/src/scriptlets/pkiconfig.py b/base/deploy/src/scriptlets/pkiconfig.py index 47ed16fc6..115e4327d 100644 --- a/base/deploy/src/scriptlets/pkiconfig.py +++ b/base/deploy/src/scriptlets/pkiconfig.py @@ -192,5 +192,5 @@ pki_master_jython_dict = None PKI_INSTANCE_SELINUX_CONTEXT = "pki_tomcat_var_lib_t" PKI_LOG_SELINUX_CONTEXT = "pki_tomcat_log_t" PKI_CFG_SELINUX_CONTEXT = "pki_tomcat_etc_rw_t" -PKI_PORT_SELINUX_CONTEXT = "pki_tomcat_port_t" +PKI_PORT_SELINUX_CONTEXT = "http_port_t" pki_selinux_config_ports = [] diff --git a/base/deploy/src/scriptlets/pkihelper.py b/base/deploy/src/scriptlets/pkihelper.py index c172301af..61ac20273 100644 --- a/base/deploy/src/scriptlets/pkihelper.py +++ b/base/deploy/src/scriptlets/pkihelper.py @@ -636,16 +636,16 @@ class configuration_file: def populate_non_default_ports(self): if master['pki_http_port'] != \ - config.PKI_DEPLOYMENT_DEFAULT_TOMCAT_HTTP_PORT: + str(config.PKI_DEPLOYMENT_DEFAULT_TOMCAT_HTTP_PORT): ports.append(master['pki_http_port']) if master['pki_https_port'] != \ - config.PKI_DEPLOYMENT_DEFAULT_TOMCAT_HTTPS_PORT: + str(config.PKI_DEPLOYMENT_DEFAULT_TOMCAT_HTTPS_PORT): ports.append(master['pki_https_port']) if master['pki_tomcat_server_port'] != \ - config.PKI_DEPLOYMENT_DEFAULT_TOMCAT_SERVER_PORT: + str(config.PKI_DEPLOYMENT_DEFAULT_TOMCAT_SERVER_PORT): ports.append(master['pki_tomcat_server_port']) if master['pki_ajp_port'] != \ - config.PKI_DEPLOYMENT_DEFAULT_TOMCAT_AJP_PORT: + str(config.PKI_DEPLOYMENT_DEFAULT_TOMCAT_AJP_PORT): ports.append(master['pki_ajp_port']) return |