puppet-forge-server 1.5.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a723929299ba18110a14486fd3b1cbe7f03d87ce
-  data.tar.gz: af3e08d28e54262825afec510df2ac1fc8bd7e70
+  metadata.gz: a171b2b28c33323c957641164b1a785700ea6372
+  data.tar.gz: 35cfa215febc8ccf95dbbfa0165ddfdc40a051cc
 SHA512:
-  metadata.gz: 934f75a71637bf473d1d06aed921d6d9d4441ee294bba6a9d68e27bdb5b526b114ee9c31897d3734895dd7fb6082337369c03e05ecdf8470ad0de353aa7b7ceb
-  data.tar.gz: a379ebd7356d498e71e72247bca25606841074bacef3d3b1d17ddba30d8da9195d30e5323fabbc4542ef389a9813ce8a06c953f60cd5e43f947e4334455bd0aa
+  metadata.gz: f94bc68aa70ab4cc0c294768bb8d94e4b1f7a9047b29499049b937f5c0d57e0be7b5972527a7afbb1edd69d81b59207640274a7264faab123dfc96dd270786e7
+  data.tar.gz: 2e329e028ae4385997e450ef9349e18a8431c9d673c8ecf59564de45e56599fe056ad158c73a6573f897fbb1e57d1a229a28b902fb59cd9e270a343ab5826b2f

data/README.md

@@ -138,6 +138,46 @@ sudo -u forge puppet-forge-server -D -m /opt/forge/modules -x https://forgeapi.p
 
 You are done. Now go install some puppet modules.
 
+### Behind Apache (Passenger Support)
+
+Apache virtualhost config:
+```
+<VirtualHost *:80>
+    ServerName localhost
+    DocumentRoot /opt/forge/public
+    <Directory /opt/forge/public>
+        Allow from all
+        Options -MultiViews
+        Require all granted
+    </Directory>
+</VirtualHost>
+```
+
+Create a `config.ru` one folder down from the Apache DocumentRoot, eg: /opt/forge/config.ru:
+```
+require 'rubygems'
+require 'puppet_forge_server'
+
+# Set base cache directory for proxy backends 
+cache_dir = '/opt/forge/cache' # default: File.join(Dir.tmpdir.to_s, 'puppet-forge-server', 'cache')
+
+# Create backends
+backends = [
+  PuppetForgeServer::Backends::Directory.new('/opt/forge/modules'),
+  # Add directory backend for serving cached modules in case proxy flips over
+  PuppetForgeServer::Backends::Directory.new(cache_dir),
+  PuppetForgeServer::Backends::ProxyV3.new('https://forgeapi.puppetlabs.com', cache_dir)
+]
+
+# Disable access logging, log errors to STDERR
+PuppetForgeServer::Logger.set({:server => STDERR, :access => File.open(File::NULL, "w")})
+
+# Run
+run PuppetForgeServer::Server.new.build(backends, PuppetForgeServer::Utils::OptionParser.class_eval('@@DEFAULT_WEBUI_ROOT'))
+```
+
+You can now connect to http://localhost and see the web interface, start using and adding modules in the same way as you would running as a Daemon.
+
 ## Web UI
 
 Puppet forge server comes with built-in web UI looking very similar to the official puppet forge web page and providing a simple module search feature. Each view haml file corresponds to the request endpoint; for example **/** or index  is formed by the index.haml located in the *views* directory and obviously combined with layout.haml that is being refered to during any request. 

data/lib/puppet_forge_server/server.rb

@@ -97,7 +97,11 @@ module PuppetForgeServer
           case type
             when 'Proxy'
               @log.info "Detecting API version for #{url}..."
-              PuppetForgeServer::Backends.const_get("#{type}V#{get_api_version(url)}").new(url.chomp('/'), options[:cache_basedir])
+              [
+                PuppetForgeServer::Backends.const_get("#{type}V#{get_api_version(url)}").new(url.chomp('/'), options[:cache_basedir]),
+                # Add directory backend for serving cached modules in case proxy flips over
+                PuppetForgeServer::Backends.const_get('Directory').new(options[:cache_basedir])
+              ]
             else
               PuppetForgeServer::Backends.const_get(type).new(url)
           end

data/lib/puppet_forge_server/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module PuppetForgeServer
-    VERSION = '1.5.3'
+    VERSION = '1.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-forge-server
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.0
 platform: ruby
 authors:
 - Ilja Bobkevic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra