# HG changeset patch # User Ivo Raisr # Date 1385685314 28800 # Node ID cce157e90da6904329f5d92646f10275ad8509c5 # Parent f4796458001318d6a7bae6669be8fd505a520959 PSARC/2013/304 Apache SMF Authorizations 16918175 apache-22 pkg needs preset authorization definitions in auth_attr.d 17597075 apache-22 pkg needs rights profile to group its authorizations diff -r f47964580013 -r cce157e90da6 components/apache2/Solaris/RtApacheSrvcMngmnt.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apache2/Solaris/RtApacheSrvcMngmnt.html Thu Nov 28 16:35:14 2013 -0800 @@ -0,0 +1,16 @@ + + + + +When Apache Service Management is in the Rights Included column, it grants the +right to manage the Apache HTTP Server SMF service. +

+If Apache Service Management is grayed, then you are not entitled to Add +or Remove this right. +
+ + diff -r f47964580013 -r cce157e90da6 components/apache2/Solaris/SmfApacheStates.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apache2/Solaris/SmfApacheStates.html Thu Nov 28 16:35:14 2013 -0800 @@ -0,0 +1,17 @@ + + + + +When Manage Apache HTTP Server Service States is in the Authorizations +Included column, it grants the authorization to enable, disable, or restart +Apache HTTP Server SMF service (both permanently and temporarily). +

+If Manage Apache HTTP Server Service States is grayed, then you are not +entitled to Add or Remove this authorization. +
+ + diff -r f47964580013 -r cce157e90da6 components/apache2/Solaris/SmfValueApache.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apache2/Solaris/SmfValueApache.html Thu Nov 28 16:35:14 2013 -0800 @@ -0,0 +1,17 @@ + + + + +When Change Values of Apache HTTP Server Service Properties is in the +Authorizations Included column, it grants the authorization to change +Apache HTTP Server service property values. +

+If Change Values of Apache HTTP Server Service Properties is grayed, +then you are not entitled to Add or Remove this authorization. +
+ + diff -r f47964580013 -r cce157e90da6 components/apache2/Solaris/auth_attr --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apache2/Solaris/auth_attr Thu Nov 28 16:35:14 2013 -0800 @@ -0,0 +1,30 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. +# + +solaris.smf.manage.apache:RO::\ +Manage Apache HTTP Server Service States::\ +help=SmfApacheStates.html + +solaris.smf.value.apache:RO::\ +Change Values of Apache HTTP Server Service Properties::\ +help=SmfValueApache.html diff -r f47964580013 -r cce157e90da6 components/apache2/Solaris/http-apache22.xml --- a/components/apache2/Solaris/http-apache22.xml Mon Dec 23 11:55:30 2013 -0800 +++ b/components/apache2/Solaris/http-apache22.xml Thu Nov 28 16:35:14 2013 -0800 @@ -22,7 +22,7 @@ @@ -96,12 +96,27 @@ - + + + + + + - - + + + + + + + + + + + + diff -r f47964580013 -r cce157e90da6 components/apache2/Solaris/prof_attr --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apache2/Solaris/prof_attr Thu Nov 28 16:35:14 2013 -0800 @@ -0,0 +1,28 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. +# + +Apache Service Management:RO::\ +Manage Apache HTTP Server SMF service:\ +auths=solaris.smf.manage.apache,\ +solaris.smf.value.apache;\ +help=RtApacheSrvcMngmnt.html diff -r f47964580013 -r cce157e90da6 components/apache2/apache-22.p5m --- a/components/apache2/apache-22.p5m Mon Dec 23 11:55:30 2013 -0800 +++ b/components/apache2/apache-22.p5m Thu Nov 28 16:35:14 2013 -0800 @@ -108,6 +108,15 @@ file etc/apache2/2.2/extra/httpd-ssl.conf path=etc/apache2/2.2/samples-conf.d/ssl.conf file etc/apache2/2.2/extra/httpd-userdir.conf path=etc/apache2/2.2/samples-conf.d/userdir.conf file etc/apache2/2.2/extra/httpd-vhosts.conf path=etc/apache2/2.2/samples-conf.d/vhosts.conf +dir path=etc/security/auth_attr.d owner=root group=sys mode=755 +file Solaris/auth_attr path=etc/security/auth_attr.d/web:server:apache-22 \ + owner=root group=sys mode=644 preserve=true restart_fmri=svc:/system/svc-rbac:default +dir path=etc/security/prof_attr.d owner=root group=sys mode=755 +file Solaris/prof_attr path=etc/security/prof_attr.d/web:server:apache-22 \ + owner=root group=sys mode=644 preserve=true restart_fmri=svc:/system/svc-rbac:default +file Solaris/RtApacheSrvcMngmnt.html path=usr/lib/help/profiles/locale/C/RtApacheSrvcMngmnt.html +file Solaris/SmfApacheStates.html path=usr/lib/help/auths/locale/C/SmfApacheStates.html +file Solaris/SmfValueApache.html path=usr/lib/help/auths/locale/C/SmfValueApache.html file Solaris/http-apache22.xml path=lib/svc/manifest/network/http-apache22.xml file path=lib/svc/method/http-apache22 file path=usr/apache2/2.2/bin/$(MACH64)/ab