Merge pull request #246 from keis/new-style-argument-systemd

Update systemd service file with new cli flags
2016-03-14 16:53:05 +01:00 · 2016-03-14 16:34:31 +01:00 · 2016-03-09 23:55:26 +01:00 · 2016-03-09 23:40:01 +01:00 · 2016-03-09 19:54:16 +01:00 · 2016-03-09 18:59:08 +01:00
3 changed files with 3 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 env:
  REPO: $TRAVIS_REPO_SLUG
-  VERSION: v1.0.alpha.$TRAVIS_COMMIT
+  VERSION: v1.0.0-beta.$TRAVIS_BUILD_NUMBER

 sudo: required

--- a/contrib/systemd/traefik.service
+++ b/contrib/systemd/traefik.service
@@ -2,5 +2,5 @@
 Description=Traefik

 [Service]
-ExecStart=/usr/bin/traefik /etc/traefik.toml
+ExecStart=/usr/bin/traefik --configFile=/etc/traefik.toml
 Restart=on-failure
--- a/server.go
+++ b/server.go
@@ -442,7 +442,7 @@ func (server *Server) loadEntryPointConfig(entryPointName string, entryPoint *En
 	regex := entryPoint.Redirect.Regex
 	replacement := entryPoint.Redirect.Replacement
 	if len(entryPoint.Redirect.EntryPoint) > 0 {
-		regex = "^(?:https?:\\/\\/)?([\\da-z\\.-]+)(?::\\d+)(.*)$"
+		regex = "^(?:https?:\\/\\/)?([\\da-z\\.-]+)(?::\\d+)?(.*)$"
 		if server.globalConfiguration.EntryPoints[entryPoint.Redirect.EntryPoint] == nil {
 			return nil, errors.New("Unknown entrypoint " + entryPoint.Redirect.EntryPoint)
 		}
Author	SHA1	Message	Date
Emile Vauge	10e223ede2	Merge pull request #246 from keis/new-style-argument-systemd Update systemd service file with new cli flags	2016-03-14 16:53:05 +01:00
David Keijser	6a8bacf01c	Update systemd service file with new cli flags	2016-03-14 16:34:31 +01:00
Emile Vauge	d4cc3900bd	Merge pull request #250 from containous/bump-beta-semver Bump to beta, using semver	2016-03-09 23:55:26 +01:00
Emile Vauge	ab619a4a3f	Bump to beta, using semver Signed-off-by: Emile Vauge <emile@vauge.com>	2016-03-09 23:40:01 +01:00
Emile Vauge	4c447985b6	Merge pull request #247 from containous/fix-redirect-bug fixes redirect bug en port 80	2016-03-09 19:54:16 +01:00
Emile Vauge	eaadd2d0cd	fixes redirect bug en port 80	2016-03-09 18:59:08 +01:00