summaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2017-02-15 10:07:20 +0100
committervarac <varacanero@zeromail.org>2017-02-15 10:07:20 +0100
commite148b0d80ebcda9ed015ce8d49d625a0e1fc7322 (patch)
tree0bbf9b1ad8348c2d52b30d8056a1c341467ad7e5 /files
parent13ba81c7593e9b16a0f5b6af28cd8d02b0ddbace (diff)
git subrepo pull files/puppet/modules/pixelated
subrepo: subdir: "files/puppet/modules/pixelated" merged: "2cc8826" upstream: origin: "https://github.com/pixelated/puppet-pixelated.git" branch: "master" commit: "2cc8826" git-subrepo: version: "0.3.0" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "841aa43"
Diffstat (limited to 'files')
-rw-r--r--files/puppet/modules/pixelated/.gitrepo4
-rw-r--r--files/puppet/modules/pixelated/files/leap_test.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/files/puppet/modules/pixelated/.gitrepo b/files/puppet/modules/pixelated/.gitrepo
index f84ebce..f0e5fa3 100644
--- a/files/puppet/modules/pixelated/.gitrepo
+++ b/files/puppet/modules/pixelated/.gitrepo
@@ -6,6 +6,6 @@
[subrepo]
remote = https://github.com/pixelated/puppet-pixelated.git
branch = master
- commit = dbd51d768ce3898bdb8b32b83aaabaf3b4e190b7
- parent = daf1749348e2aa4d6dcd05d8bca9bfc517ced9c7
+ commit = 2cc88265cd94199f72f4c562494a3b8d780ac581
+ parent = 13ba81c7593e9b16a0f5b6af28cd8d02b0ddbace
cmdver = 0.3.0
diff --git a/files/puppet/modules/pixelated/files/leap_test.rb b/files/puppet/modules/pixelated/files/leap_test.rb
index 19dccde..524297f 100644
--- a/files/puppet/modules/pixelated/files/leap_test.rb
+++ b/files/puppet/modules/pixelated/files/leap_test.rb
@@ -8,7 +8,7 @@ class Pixelated < LeapTest
def setup
end
def test_01_Are_daemons_running?
- assert_running service: '/usr/bin/pixelated-user-agent'
+ assert_running service: 'pixelated-server'
pass
end
def test_02_can_connect_to_useragent?