From df2b26e350121834435d1f4b888a8ecd00c0b5db Mon Sep 17 00:00:00 2001
From: Slair1 <slair@ippathways.com>
Date: Wed, 2 May 2018 02:45:48 -0500
Subject: [PATCH] CLOUDSTACK-10311 Agent Log Rotate variable replace bug
 (#2471)

* CLOUDSTACK-10311 Agent Log Rotate variable replace bug

* update travis timeouts
---
 .travis.yml                                                 | 4 ++--
 ...dstack-agent.logrotate => cloudstack-agent.logrotate.in} | 0
 agent/pom.xml                                               | 6 ------
 3 files changed, 2 insertions(+), 8 deletions(-)
 rename agent/conf/{cloudstack-agent.logrotate => cloudstack-agent.logrotate.in} (100%)

diff --git a/.travis.yml b/.travis.yml
index f975c55eacb..359d6666788 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -149,9 +149,9 @@ env:
 #    - TESTS="component/test_accounts"
 #    - TESTS="component/test_organization_states"
 
-before_install: travis_wait 30 ./tools/travis/before_install.sh
+before_install: travis_wait 60 ./tools/travis/before_install.sh
 install: ./tools/travis/install.sh
-before_script: travis_wait 30 ./tools/travis/before_script.sh
+before_script: travis_wait 60 ./tools/travis/before_script.sh
 script:
   - travis_wait 40 ./tools/travis/script.sh ${TESTS}
 after_success: ./tools/travis/after_success.sh
diff --git a/agent/conf/cloudstack-agent.logrotate b/agent/conf/cloudstack-agent.logrotate.in
similarity index 100%
rename from agent/conf/cloudstack-agent.logrotate
rename to agent/conf/cloudstack-agent.logrotate.in
diff --git a/agent/pom.xml b/agent/pom.xml
index 2eb6ca9e9aa..02eb9d8b1dc 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -93,12 +93,6 @@
                     </filterreader>
                   </filterchain>
                 </copy>
-                <copy
-                  todir="${basedir}/target/transformed">
-                  <fileset dir="${basedir}/conf">
-                    <include name="cloudstack-agent.logrotate" />
-                  </fileset>
-                </copy>
               </target>
             </configuration>
           </execution>