Author: thomas.diesler(a)jboss.com Date: 2007-03-29 05:20:06 -0400 (Thu, 29 Mar 2007) New Revision: 2710 Added: trunk/build/hudson/apache-tomcat/conf/tomcat-users.xml Modified: trunk/build/ant-import/build-hudson.xml trunk/build/ant.properties.example trunk/build/hudson/hudson-home/config.xml Log: Secure the hudson environment Modified: trunk/build/ant-import/build-hudson.xml =================================================================== --- trunk/build/ant-import/build-hudson.xml 2007-03-29 08:29:46 UTC (rev 2709) +++ trunk/build/ant-import/build-hudson.xml 2007-03-29 09:20:06 UTC (rev 2710) @@ -28,6 +28,11 @@ <available file="${hudson.root}" property="hudson.root.available"/> <available file="${hudson.tomcat}" property="hudson.tomcat.available"/> <fail message="Hudson root not available" unless="hudson.root.available"/> + + <property name="hudson.username.${hudson.username}" value="true"/> + <fail message="Cannot use default hudson username: ${hudson.username}" if="hudson.username.changeme"/> + <property name="hudson.password.${hudson.password}" value="true"/> + <fail message="Cannot use default hudson password: ${hudson.password}" if="hudson.password.changeme"/> </target> <!-- @@ -46,13 +51,12 @@ <!-- Configure Tomcat --> <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/> - <copy todir="${hudson.tomcat}"> + <copy todir="${hudson.tomcat}" overwrite="true"> <fileset dir="${build.dir}/hudson/apache-tomcat"> <include name="**/*.xml"/> </fileset> <filterset> - <filter token="hudson.home" value="${hudson.home}"/> - <filter token="hudson.port" value="${hudson.port}"/> + <filtersfile file="${build.dir}/ant.properties"/> </filterset> </copy> </target> Modified: trunk/build/ant.properties.example =================================================================== --- trunk/build/ant.properties.example 2007-03-29 08:29:46 UTC (rev 2709) +++ trunk/build/ant.properties.example 2007-03-29 09:20:06 UTC (rev 2710) @@ -26,6 +26,9 @@ ri.home=/usr/java/jaxws-ri # Hudson QA Environment +hudson.username=changeme +hudson.password=changeme + hudson.root=/home/tdiesler/workspace hudson.port=8180 @@ -44,7 +47,7 @@ hudson.jboss40.build=jboss-4.0.5.SP1 hudson.jboss40.rev=HEAD -hudson.mail.recipients=yourname(a)jboss.com +hudson.mail.recipients=thomas.diesler(a)jboss.com hudson.smtp.host=pobox-2.corp.redhat.com # JBoss Repository Added: trunk/build/hudson/apache-tomcat/conf/tomcat-users.xml =================================================================== --- trunk/build/hudson/apache-tomcat/conf/tomcat-users.xml (rev 0) +++ trunk/build/hudson/apache-tomcat/conf/tomcat-users.xml 2007-03-29 09:20:06 UTC (rev 2710) @@ -0,0 +1,5 @@ +<?xml version='1.0' encoding='utf-8'?> +<tomcat-users> + <role rolename="admin"/> + <user username=&quot;@hudson.username(a)&quot; password=&quot;@hudson.password(a)&quot; roles="admin"/> +</tomcat-users> Property changes on: trunk/build/hudson/apache-tomcat/conf/tomcat-users.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/build/hudson/hudson-home/config.xml =================================================================== --- trunk/build/hudson/hudson-home/config.xml 2007-03-29 08:29:46 UTC (rev 2709) +++ trunk/build/hudson/hudson-home/config.xml 2007-03-29 09:20:06 UTC (rev 2710) @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <hudson> <numExecutors>1</numExecutors> - <useSecurity>false</useSecurity> + <useSecurity>true</useSecurity> <systemMessage> <![CDATA[ <h2&gt;JBossWS-(a)version.id@ QA Environment</h2>