# HG changeset patch # User Ivo Raisr # Date 1383709542 28800 # Node ID 55703e1924ca56bced23b8ae6a6f52e5d85d66b1 # Parent ba5260980a341215f8e36aa896d40128adbc4c59 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 ba5260980a34 -r 55703e1924ca components/apache2/Solaris/RtApacheSrvcMngmnt.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apache2/Solaris/RtApacheSrvcMngmnt.html Tue Nov 05 19:45:42 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 ba5260980a34 -r 55703e1924ca components/apache2/Solaris/SmfApacheStates.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apache2/Solaris/SmfApacheStates.html Tue Nov 05 19:45:42 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 ba5260980a34 -r 55703e1924ca components/apache2/Solaris/SmfValueApache.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apache2/Solaris/SmfValueApache.html Tue Nov 05 19:45:42 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 ba5260980a34 -r 55703e1924ca components/apache2/Solaris/auth_attr --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apache2/Solaris/auth_attr Tue Nov 05 19:45:42 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 ba5260980a34 -r 55703e1924ca components/apache2/Solaris/http-apache22.xml --- a/components/apache2/Solaris/http-apache22.xml Tue Nov 05 10:22:38 2013 -0800 +++ b/components/apache2/Solaris/http-apache22.xml Tue Nov 05 19:45:42 2013 -0800 @@ -22,7 +22,7 @@ @@ -96,12 +96,12 @@ - + - - + + diff -r ba5260980a34 -r 55703e1924ca components/apache2/Solaris/prof_attr --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apache2/Solaris/prof_attr Tue Nov 05 19:45:42 2013 -0800 @@ -0,0 +1,29 @@ +# +# 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:\ +profiles=Service Configuration;\ +auths=solaris.smf.manage.apache,\ +solaris.smf.value.apache;\ +help=RtApacheSrvcMngmnt.html diff -r ba5260980a34 -r 55703e1924ca components/apache2/apache-22-message-files.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apache2/apache-22-message-files.p5m Tue Nov 05 19:45:42 2013 -0800 @@ -0,0 +1,39 @@ +# +# 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. +# + +set name=pkg.fmri \ + value=pkg://$(PUBLISHER_LOCALIZABLE)/web/server/apache-22-message-files@$(PKG_SOLARIS_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="Translatable content for Apache Web Server V2.2" +set name=com.oracle.info.description value="the translatable content for Apache Web Server V2.2" +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +set name=org.opensolaris.arc-caseid value=LSARC/2009/565 +# since this package is internal, we do not need some metadata +set name=pkg.linted.pkglint.manifest010.2 value=true +set name=pkg.linted.opensolaris.manifest001.1 value=true +set name=pkg.linted.userland.manifest001.0 value=true + +file Solaris/RtApacheSrvcMngmnt.html path=usr/lib/help/profiles/locale/__LOCALE__/RtApacheSrvcMngmnt.html +file Solaris/SmfApacheStates.html path=usr/lib/help/auths/locale/__LOCALE__/SmfApacheStates.html +file Solaris/SmfValueApache.html path=usr/lib/help/auths/locale/__LOCALE__/SmfValueApache.html + +license apache.license license="Apache v2.0" diff -r ba5260980a34 -r 55703e1924ca components/apache2/apache-22.p5m --- a/components/apache2/apache-22.p5m Tue Nov 05 10:22:38 2013 -0800 +++ b/components/apache2/apache-22.p5m Tue Nov 05 19:45:42 2013 -0800 @@ -72,6 +72,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