You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/05/27 12:38:10 UTC
[1/2] stratos git commit: Fix document root of php puppet templates
Repository: stratos
Updated Branches:
refs/heads/master b35001827 -> 53dc606ec
Fix document root of php puppet templates
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/53dc606e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/53dc606e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/53dc606e
Branch: refs/heads/master
Commit: 53dc606ecbed35b9683a108239a96a048b3c13c7
Parents: b0eec64
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Wed May 27 15:47:38 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Wed May 27 15:47:45 2015 +0530
----------------------------------------------------------------------
.../modules/php/templates/apache2/sites-available/default-ssl.erb | 2 +-
.../modules/php/templates/apache2/sites-available/default.erb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/53dc606e/tools/puppet3/modules/php/templates/apache2/sites-available/default-ssl.erb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/php/templates/apache2/sites-available/default-ssl.erb b/tools/puppet3/modules/php/templates/apache2/sites-available/default-ssl.erb
index 0d9c6ca..572dfe5 100755
--- a/tools/puppet3/modules/php/templates/apache2/sites-available/default-ssl.erb
+++ b/tools/puppet3/modules/php/templates/apache2/sites-available/default-ssl.erb
@@ -24,7 +24,7 @@
<VirtualHost _default_:443>
ServerAdmin webmaster@localhost
- DocumentRoot <%= docroot %>/www/
+ DocumentRoot <%= docroot %>/
Alias /simplesaml <%= samlalias %>
<Directory />
Options FollowSymLinks
http://git-wip-us.apache.org/repos/asf/stratos/blob/53dc606e/tools/puppet3/modules/php/templates/apache2/sites-available/default.erb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/php/templates/apache2/sites-available/default.erb b/tools/puppet3/modules/php/templates/apache2/sites-available/default.erb
index 51da537..0999343 100755
--- a/tools/puppet3/modules/php/templates/apache2/sites-available/default.erb
+++ b/tools/puppet3/modules/php/templates/apache2/sites-available/default.erb
@@ -23,7 +23,7 @@
<VirtualHost *:80>
ServerAdmin webmaster@localhost
- DocumentRoot <%= docroot %>/www/
+ DocumentRoot <%= docroot %>/
Alias /simplesaml <%= samlalias %>
<Directory />
Options FollowSymLinks
[2/2] stratos git commit: Remove ant-run pluging from python agent
component
Posted by la...@apache.org.
Remove ant-run pluging from python agent component
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b0eec641
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b0eec641
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b0eec641
Branch: refs/heads/master
Commit: b0eec64197b43c062df4e2f8a0ca47d03dea541c
Parents: b350018
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Wed May 27 15:47:09 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Wed May 27 15:47:45 2015 +0530
----------------------------------------------------------------------
.../pom.xml | 17 -----------------
1 file changed, 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/b0eec641/components/org.apache.stratos.python.cartridge.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/pom.xml b/components/org.apache.stratos.python.cartridge.agent/pom.xml
index 871fbfe..7110679 100644
--- a/components/org.apache.stratos.python.cartridge.agent/pom.xml
+++ b/components/org.apache.stratos.python.cartridge.agent/pom.xml
@@ -71,23 +71,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <zip destfile="${project.build.directory}/apache-stratos-python-cartridge-agent-${project.version}.zip"
- basedir="${project.basedir}/src/main/python/cartridge.agent/cartridge.agent"/>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>