Dzahn has submitted this change and it was merged.

Change subject: after removing docs generation this require for apache2 package 
broke puppet runs - remove dependency
......................................................................


after removing docs generation this require for apache2 package broke
puppet runs - remove dependency

and let's fix some quoting and syntax error expecting a ;
Change-Id: I82208073a6137ea6b2860a08fe611ae372231dbc
---
M manifests/svn.pp
1 file changed, 9 insertions(+), 10 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/svn.pp b/manifests/svn.pp
index 9844bfa..fe90f6c 100644
--- a/manifests/svn.pp
+++ b/manifests/svn.pp
@@ -12,31 +12,30 @@
        }
 
        file {
-               "/usr/local/bin/sillyshell":
+               '/usr/local/bin/sillyshell':
                        owner => root,
                        group => root,
                        mode  => 0555,
-                       source => "puppet:///files/svn/sillyshell";
-               "/etc/apache2/sites-available/svn":
+                       source => 'puppet:///files/svn/sillyshell';
+               '/etc/apache2/sites-available/svn':
                        owner => root,
                        group => root,
                        mode => 0444,
-                       source => 
"puppet:///files/apache/sites/svn.wikimedia.org",
+                       source => 
'puppet:///files/apache/sites/svn.wikimedia.org',
                        notify => Service[apache2];
-               "/srv/org/wikimedia/svn":
+               '/srv/org/wikimedia/svn':
                        ensure => directory,
-                       source => "puppet:///files/svn/docroot",
+                       source => 'puppet:///files/svn/docroot',
                        owner => root,
                        group => svnadm,
                        mode  => 0664,
                        recurse => true;
-               "/var/cache/svnusers":
+               '/var/cache/svnusers':
                        ensure => directory,
                        owner => www-data,
                        group => www-data,
-                       mode => 0755,
-                       require => Package[apache2];
-               "/svnroot":
+                       mode => 0755;
+               '/svnroot':
                        ensure => directory,
                        owner => root,
                        group => svn,

-- 
To view, visit https://gerrit.wikimedia.org/r/54808
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I82208073a6137ea6b2860a08fe611ae372231dbc
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to