Merge pull request #98 from ripienaar/97

(#97) fix permissions to the cache store directory
choria-legacy · Nov 2, 2018 · 95ad300 · 95ad300
2 parents 71d394e + 5db7ba5
commit 95ad300
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 34 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -27,9 +27,9 @@ jobs:
     working_directory: /go/src/github.com/choria-io/stream-replicator
 
     environment:
-      - PACKAGE: el6_64
-      - BUILD: foss
-      - BUILDER: choria/packager:el5-go9.2
+      PACKAGE: el6_64
+      BUILD: foss
+      BUILDER: choria/packager:el5-go9.2
 
     steps: &std_build_steps
       - setup_remote_docker
@@ -72,23 +72,23 @@ jobs:
   build_el6_32bit_rpms:
     <<: *pkg_build
     environment:
-      - PACKAGE: el6_32
-      - BUILD: foss
-      - BUILDER: choria/packager:el7-go9.2
+      PACKAGE: el6_32
+      BUILD: foss
+      BUILDER: choria/packager:el7-go9.2
 
   build_el7_64bit_rpms:
     <<: *pkg_build
     environment:
-      - PACKAGE: el7_64
-      - BUILD: foss
-      - BUILDER: choria/packager:el7-go9.2
+      PACKAGE: el7_64
+      BUILD: foss
+      BUILDER: choria/packager:el7-go9.2
 
   build_puppet_module:
     <<: *pkg_build
     environment:
-      - PACKAGE: puppet
-      - BUILD: foss
-      - BUILDER: choria/packager:el7-go9.2-puppet
+      PACKAGE: puppet
+      BUILD: foss
+      BUILDER: choria/packager:el7-go9.2-puppet
 
   gather_artifacts:
     docker:
@@ -103,7 +103,7 @@ jobs:
 
   nightly_packagecloud: &packagecloud_push
     environment:
-      - REPO: nightly
+      REPO: nightly
 
     docker:
       - image: circleci/ruby
@@ -127,7 +127,7 @@ jobs:
   release_packagecloud:
     <<: *packagecloud_push
     environment:
-      - REPO: release
+      REPO: release
 
 workflows:
   version: 2

diff --git a/glide.lock b/glide.lock
diff --git a/packager/templates/el/el6/stream-replicator.spec b/packager/templates/el/el6/stream-replicator.spec
@@ -74,7 +74,7 @@ fi
 %attr(644, root, root) %config(noreplace)/etc/sysconfig/%{pkgname}
 %attr(755, nobody, nobody)/var/run/%{pkgname}
 %attr(640, nobody, nobody)/var/log/%{pkgname}.log
-%attr(640, nobody, nobody)/var/lib/%{pkgname}
+%attr(740, nobody, nobody)/var/lib/%{pkgname}
 
 %changelog
 * Tue Dec 26 2017 R.I.Pienaar <[email protected]>

diff --git a/packager/templates/el/el7/stream-replicator.spec b/packager/templates/el/el7/stream-replicator.spec
@@ -71,7 +71,7 @@ fi
 /etc/logrotate.d/%{pkgname}
 /usr/lib/systemd/system/%{pkgname}@.service
 %attr(640, nobody, nobody)/var/log/%{pkgname}.log
-%attr(640, nobody, nobody)/var/lib/%{pkgname}
+%attr(740, nobody, nobody)/var/lib/%{pkgname}
 
 %changelog
 * Tue Dec 26 2017 R.I.Pienaar <[email protected]>