diff options
| author | Colin Guthrie <colin@mageia.org> | 2014-06-15 11:12:52 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2014-06-15 11:12:52 +0100 |
| commit | dec8f44c8646c3c01ef4265691d2ba894706c1c5 (patch) | |
| tree | 497b02dd12cb342098ae8ccf149fbf4bd2f84183 | |
| parent | 2f9628d8b3358ee805a3aa6cff07104793142725 (diff) | |
| download | puppet-dec8f44c8646c3c01ef4265691d2ba894706c1c5.tar puppet-dec8f44c8646c3c01ef4265691d2ba894706c1c5.tar.gz puppet-dec8f44c8646c3c01ef4265691d2ba894706c1c5.tar.bz2 puppet-dec8f44c8646c3c01ef4265691d2ba894706c1c5.tar.xz puppet-dec8f44c8646c3c01ef4265691d2ba894706c1c5.zip | |
websites: Switch static.mageia.org to git
| -rw-r--r-- | deployment/websites/manifests/static.pp | 4 | ||||
| -rw-r--r-- | deployment/websites/templates/vhost_static.conf | 20 |
2 files changed, 22 insertions, 2 deletions
diff --git a/deployment/websites/manifests/static.pp b/deployment/websites/manifests/static.pp index 749f72b0..b82b9029 100644 --- a/deployment/websites/manifests/static.pp +++ b/deployment/websites/manifests/static.pp @@ -10,7 +10,7 @@ class websites::static { ensure => directory, } - subversion::snapshot { "$vhostdir/g": - source => "svn://svn.$::domain/svn/web/www/trunk/g/", + git::snapshot { "$vhostdir": + source => "git://git.$::domain/web/www", } } diff --git a/deployment/websites/templates/vhost_static.conf b/deployment/websites/templates/vhost_static.conf index 866d235a..2d3f4c44 100644 --- a/deployment/websites/templates/vhost_static.conf +++ b/deployment/websites/templates/vhost_static.conf @@ -19,11 +19,21 @@ AddOutputFilterByType DEFLATE application/json text/javascript application/javascript application/x-javascript <Location /> + Deny from all + </Location> + + <Location /g/> Allow from all </Location> <Directory <%= vhostdir %>> Order deny,allow + Deny from All + AllowOverride None + </Directory> + + <Directory <%= vhostdir %>/g> + Order deny,allow Allow from All AllowOverride None </Directory> @@ -52,11 +62,21 @@ AddOutputFilterByType DEFLATE application/json text/javascript application/javascript application/x-javascript <Location /> + Deny from all + </Location> + + <Location /g/> Allow from all </Location> <Directory <%= vhostdir %>> Order deny,allow + Deny from All + AllowOverride None + </Directory> + + <Directory <%= vhostdir %>/g> + Order deny,allow Allow from All AllowOverride None </Directory> |