[java-identity-provider COMMIT] in /trunk/idp-installer/src/main/wix: ShibbolethIdP-main.wxs procrun.wxs

[noreply at shibboleth.net]

Author: rdw
Date: Sat Sep 27 11:14:12 2014
New Revision: 6600

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6600&view=rev
Log:
IDP-469 Have the shibd_idp daemon start up.  Add ACLs to conf, creds and jetty-base\start.d to disallow non-administrators (because this is where we keep confidential material)

Modified:
    trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
    trunk/idp-installer/src/main/wix/procrun.wxs

Modified: trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs?rev=6600&r1=6599&r2=6600&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs (original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs Sat Sep 27 11:14:12 2014
@@ -40,13 +40,32 @@
       </Feature>
       <ComponentGroupRef Id="IdPGroup"/>
       <ComponentGroupRef Id="SaveRegistry"/>
-    </Feature>
+      <ComponentRef Id="IdPPermissions"/>
+   </Feature>
 
     <Directory Id="TARGETDIR" Name="SourceDir" >
       <Directory Id="ProgramFilesFolder" >
         <Directory Id="INSTALLDIR" Name="Shibboleth" >
           <Merge Id="jetty" Language="1033" SourceFile="$(var.ProjectDir)\jetty-$(var.msitype).msm" DiskId="1"/>
-          <Directory Id="IdPFolder" Name="IdP"/>
+	    <Directory Id="IdPFolder" Name="IdP">
+		<Directory Id="CredsFolder" Name="creds"/>
+		<Directory Id="ConfFolder" Name="conf"/>
+		<Directory Id="JettyBaseFolder" Name="jetty-base">
+		    <Directory Id="StartDotD" Name="start.d"/>
+		</Directory>
+		<Component Id="IdPPermissions" Guid="{5672474B-3CD2-44EB-9942-871844A2B089}" Win64="no">
+		    <RegistryValue Id="SetPermissions" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="SetPermissions" Value="TRUE" Type="string" KeyPath="yes" />
+		    <CreateFolder Directory="CredsFolder">
+			<Permission User="Administrators" GenericAll="yes"/>
+		    </CreateFolder>
+		    <CreateFolder Directory="ConfFolder">
+			<Permission User="Administrators" GenericAll="yes"/>
+		    </CreateFolder>
+		    <CreateFolder Directory="StartDotD">
+			<Permission User="Administrators" GenericAll="yes"/>
+		    </CreateFolder>
+		</Component>
+	    </Directory>
         </Directory>
       </Directory>
     </Directory>

Modified: trunk/idp-installer/src/main/wix/procrun.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/procrun.wxs?rev=6600&r1=6599&r2=6600&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/procrun.wxs (original)
+++ trunk/idp-installer/src/main/wix/procrun.wxs Sat Sep 27 11:14:12 2014
@@ -15,7 +15,7 @@
      implied.  See the License for the specific language governing
      permissions and limitations under the License.  -->
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <?define ServiceStart="demand"?>
+    <?define ServiceStart="auto"?>
     <?define ServiceName="shibd_idp"?>
     <Fragment>
         <DirectoryRef Id="PROCRUNROOT">