Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2012-12-02 17:46:46 -0500
committerSteffen Pingel2013-04-11 19:32:40 -0400
commit0fc792d196e825bc409f6b7be6e8d883d792ba38 (patch)
tree96792d24811902130387aef054a18f4b67f78b4a /org.eclipse.mylyn.trac.releng
parent98cbe01c925cf613832919c62d633f6027264fb5 (diff)
downloadorg.eclipse.mylyn.tasks-0fc792d196e825bc409f6b7be6e8d883d792ba38.tar.gz
org.eclipse.mylyn.tasks-0fc792d196e825bc409f6b7be6e8d883d792ba38.tar.xz
org.eclipse.mylyn.tasks-0fc792d196e825bc409f6b7be6e8d883d792ba38.zip
400396: consume Trac fixtures from service
Change-Id: Ia3811b53d37bc21b33ae69b5726db73fa8d7cb85 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=400396
Diffstat (limited to 'org.eclipse.mylyn.trac.releng')
-rw-r--r--org.eclipse.mylyn.trac.releng/modules/trac/manifests/defaultsites.pp29
-rw-r--r--org.eclipse.mylyn.trac.releng/modules/trac/manifests/service.pp1
-rw-r--r--org.eclipse.mylyn.trac.releng/modules/trac/manifests/site.pp5
-rw-r--r--org.eclipse.mylyn.trac.releng/modules/trac/templates/service.json.erb8
-rw-r--r--org.eclipse.mylyn.trac.releng/modules/trac/templates/trac.ini.erb3
5 files changed, 33 insertions, 13 deletions
diff --git a/org.eclipse.mylyn.trac.releng/modules/trac/manifests/defaultsites.pp b/org.eclipse.mylyn.trac.releng/modules/trac/manifests/defaultsites.pp
index 68a17f887..6b1e3c145 100644
--- a/org.eclipse.mylyn.trac.releng/modules/trac/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.trac.releng/modules/trac/manifests/defaultsites.pp
@@ -28,12 +28,15 @@ define trac::defaultsites ($base = $trac::base, $userOwner = $trac::userOwner, $
trac::trac { "0.11.7":
}
- trac::trac { "0.12.4":
+ trac::trac { "0.12.5":
}
trac::trac { "1.0":
}
+ trac::trac { "1.0.1":
+ }
+
trac::trac { "trunk":
}
@@ -56,37 +59,43 @@ define trac::defaultsites ($base = $trac::base, $userOwner = $trac::userOwner, $
/* Sites */
- trac::site { "trac-0.11":
+ trac::site { "trac-0.11.7":
version => "0.11.7",
require => Trac["0.11.7"],
}
- trac::site { "trac-0.12":
- version => "0.12.4",
- require => Trac["0.12.4"],
+ trac::site { "trac-0.12.5":
+ version => "0.12.5",
+ require => Trac["0.12.5"],
}
trac::site { "trac-1.0":
version => "1.0",
- require => Trac["1.0"],
+ require => Trac["1.0"]
+ }
+
+ trac::site { "trac-1.0.1":
+ version => "1.0.1",
+ require => Trac["1.0.1"],
+ envdefault => 1,
}
- trac::site { "trac-allbasic":
+ trac::site { "trac-1.0-allbasic":
allbasicauth => true,
envinfo => "AllBasicAuth",
}
- trac::site { "trac-cert":
+ trac::site { "trac-1.0-cert":
certauth => true,
envinfo => "CertAuth",
}
- trac::site { "trac-digest":
+ trac::site { "trac-1.0-digest":
digestauth => true,
envinfo => "DigestAuth",
}
- trac::site { "trac-form-auth":
+ trac::site { "trac-1.0-form-auth":
accountmanagerplugin => "0.11",
envinfo => "FormAuth",
}
diff --git a/org.eclipse.mylyn.trac.releng/modules/trac/manifests/service.pp b/org.eclipse.mylyn.trac.releng/modules/trac/manifests/service.pp
index 96b41c121..e15a6080d 100644
--- a/org.eclipse.mylyn.trac.releng/modules/trac/manifests/service.pp
+++ b/org.eclipse.mylyn.trac.releng/modules/trac/manifests/service.pp
@@ -3,6 +3,7 @@ define trac::service (
$version,
$envtype = "trac",
$envinfo = "",
+ $envdefault = 0,
$envmode = "XML-RPC",
$accessmode = "XML_RPC",
$base = $trac::base,
diff --git a/org.eclipse.mylyn.trac.releng/modules/trac/manifests/site.pp b/org.eclipse.mylyn.trac.releng/modules/trac/manifests/site.pp
index facacc75f..78fdd991e 100644
--- a/org.eclipse.mylyn.trac.releng/modules/trac/manifests/site.pp
+++ b/org.eclipse.mylyn.trac.releng/modules/trac/manifests/site.pp
@@ -10,6 +10,7 @@ define trac::site (
$base = $trac::base,
$envtype = "trac",
$envinfo = "",
+ $envdefault = 0,
$userOwner = $trac::userOwner,
$userGroup = $trac::userGroup,) {
$prefix = "$base/share/trac-$version"
@@ -41,7 +42,7 @@ define trac::site (
}
exec { "svn create $envid":
- command => "svnadmin create $envbase/svn",
+ command => "/usr/bin/svnadmin create $envbase/svn",
require => File["$envbase/svn"],
creates => "$envbase/svn/format",
user => "www-data",
@@ -158,6 +159,7 @@ define trac::site (
envid => "$title",
version => "$version",
envinfo => "$envinfo",
+ envdefault => $envdefault,
envmode => "XML-RPC",
accessmode => "XML_RPC",
}
@@ -166,6 +168,7 @@ define trac::site (
envid => "$title",
version => "$version",
envinfo => "$envinfo",
+ envdefault => 0,
envmode => "Web",
accessmode => "TRAC_0_9",
}
diff --git a/org.eclipse.mylyn.trac.releng/modules/trac/templates/service.json.erb b/org.eclipse.mylyn.trac.releng/modules/trac/templates/service.json.erb
index dfff4a541..41d4d8ec0 100644
--- a/org.eclipse.mylyn.trac.releng/modules/trac/templates/service.json.erb
+++ b/org.eclipse.mylyn.trac.releng/modules/trac/templates/service.json.erb
@@ -7,7 +7,15 @@
<% else %>
"info": "<%= envinfo %>/<%= envmode %>",
<% end %>
+ "tags": [
+<% if @envinfo == "DigestAuth" || @envinfo == "FormAuth" %>
+ "misc"
+<% end %>
+ ],
"properties":{
+<% if @envdefault != 0 %>
+ "default": "<%= envdefault %>",
+<% end %>
"version": "<%= accessmode %>"
}
}
diff --git a/org.eclipse.mylyn.trac.releng/modules/trac/templates/trac.ini.erb b/org.eclipse.mylyn.trac.releng/modules/trac/templates/trac.ini.erb
index e57ea7022..5d214958c 100644
--- a/org.eclipse.mylyn.trac.releng/modules/trac/templates/trac.ini.erb
+++ b/org.eclipse.mylyn.trac.releng/modules/trac/templates/trac.ini.erb
@@ -35,9 +35,8 @@ acct_mgr.web_ui.RegistrationModule = disabled
<% if @accountmanagerplugin != "" %>
[account-manager]
-password_format = htpasswd
password_store = HtPasswdStore
-password_file = <%= envbase %>/htpasswd
+htpasswd_file = <%= envbase %>/htpasswd
<% end %>
[header_logo]

Back to the top