Skip to content

Commit

Permalink
Merge pull request #388 from mysteriumnetwork/release-03-fixes
Browse files Browse the repository at this point in the history
Fixed upload artifacts to release and set iptables rules
  • Loading branch information
soffokl authored Sep 20, 2018
2 parents 9ac7b26 + ed84b39 commit 5027e5c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 13 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,9 @@ jobs:
file: build/package/*
skip_cleanup: true
api_key: "$GIT_RELEASES_API_KEY"
- script:
on:
tags: true
- script:
- bin/s3 sync s3://docker-images build/docker
- docker load -i build/docker/myst_alpine.tgz
- docker load -i build/docker/myst_ubuntu.tgz
Expand Down
8 changes: 2 additions & 6 deletions nat/service_iptables.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,11 @@ func (service *serviceIPTables) Add(rule RuleForwarding) {
func (service *serviceIPTables) Start() error {
err := service.ipForward.Enable()
if err != nil {
return err
log.Warn(natLogPrefix, "Failed to enable IP forwarding: ", err)
}

service.clearStaleRules()
err = service.enableRules()
if err != nil {
return err
}
return nil
return service.enableRules()
}

func (service *serviceIPTables) Stop() {
Expand Down
8 changes: 2 additions & 6 deletions nat/service_pfctl.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,11 @@ func (service *servicePFCtl) Add(rule RuleForwarding) {
func (service *servicePFCtl) Start() error {
err := service.ipForward.Enable()
if err != nil {
return err
log.Warn(natLogPrefix, "Failed to enable IP forwarding: ", err)
}

service.clearStaleRules()
err = service.enableRules()
if err != nil {
return err
}
return nil
return service.enableRules()
}

func (service *servicePFCtl) Stop() {
Expand Down

0 comments on commit 5027e5c

Please sign in to comment.