smartcloud 0.0.48 → 0.0.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fac6f4d2640ee0fb06b196fff3db48c38454583bce793766722fb2cc67e3c143
-  data.tar.gz: e5a004c73c907fda782b5c191a3be34bd5d6a2975b0ec95c2810cc483a12370e
+  metadata.gz: a51ea5220f8369af62e7af8d07756839cdd67c6c64b7f6a0e2f84c9f6e626870
+  data.tar.gz: 5ab1989753710825e0bca32c236a329be406fa3215e0afef5e28742ef8ab3fdf
 SHA512:
-  metadata.gz: 4d82bcf0cbd81730cbd1c036177705bd98e2d3d77e734a8a676f3386a286e5fb3b7bdb1c013f853d542001add4cd60ede8c6e627e7a7587f98232081f61b8362
-  data.tar.gz: 755d446c4cd10366e208563b39c2a0c7bb4b480127f46adc4677b35366445bfdec3089e104c5425baff1e72b42a25b895f563be505fc964523574f1acf1edbdd
+  metadata.gz: d9b00e31e0a7eddbda9442b86f54396bb588596cc0c18926ca7908bb1b94648b19707afc7d7a14e9c04dcb5e2072d7434372b872aa766351eea1074a75a26e70
+  data.tar.gz: '091d98575f537ff8e1e76a9160afb3b455f3fb4b091b47c905cbf25ecf3c1c41be71a556cf1ea0eb967d3b260bf748c3f0069843abeecf57fd7006c89d1020cc'

data/lib/smartcloud/grids/grid-nginx/fastcgi.conf

@@ -2,10 +2,7 @@ client_max_body_size 0; # Git pushes can be massive, just to make sure nginx doe
 
 include fastcgi_params; # Include the default fastcgi configs
 
-fastcgi_param SCRIPT_FILENAME /usr/libexec/git-core/git-http-backend; # Tells fastcgi to pass the request to the git http backend executable.
-fastcgi_param GIT_HTTP_EXPORT_ALL "";
-# fastcgi_param GIT_PROJECT_ROOT /.smartcloud/grids/grid-runner/apps/repositories; # is the location of all of your git repositories.
-fastcgi_param PATH_INFO $path_info; # Takes the capture group from our location directive and gives git that.
+fastcgi_param PATH_INFO $uri; # Takes the capture group from our location directive and gives git that.
 fastcgi_param REMOTE_USER $remote_user; # Forward REMOTE_USER as we want to know when we are authenticated
 
-# IMPORTANT NOTE: Other required fastcgi_params have been defined already as environment variables in the runner container and hence need not be passed here.
+# IMPORTANT NOTE: Other required fastcgi_params have been defined as environment variables in the runner container and hence need not be passed here.

data/lib/smartcloud/grids/grid-runner/Dockerfile

@@ -26,6 +26,11 @@ RUN apk add --update git && \
 
 RUN gem install smartcloud --no-rdoc --no-ri
 
+# Setting environment variables for git-http-backend to use pre-receive hook
+# These will be used by fcgiwrap for fcgi
+ENV SCRIPT_FILENAME=/usr/libexec/git-core/git-http-backend
+ENV GIT_HTTP_EXPORT_ALL=""
+
 # launch fcgiwrap via spawn-fcgi; launch nginx in the foreground
 # so the container doesn't die on us; supposedly we should be
 # using supervisord or something like that instead, but this

data/lib/smartcloud/grids/nginx.rb

@@ -76,6 +76,7 @@ module Smartcloud
 						--name='nginx-letsencrypt' \
 						--env NGINX_PROXY_CONTAINER=nginx \
 						--env NGINX_DOCKER_GEN_CONTAINER=nginx-gen \
+						--env DEFAULT_EMAIL=#{Smartcloud.config.sysadmin_email} \
 						--volumes-from nginx \
 						--volume='/var/run/docker.sock:/var/run/docker.sock:ro' \
 						--restart='always' \

data/lib/smartcloud/grids/runner.rb

@@ -23,7 +23,7 @@ module Smartcloud
 							--env LETSENCRYPT_HOST=#{Smartcloud.config.git_domain} \
 							--env LETSENCRYPT_EMAIL=#{Smartcloud.config.sysadmin_email} \
 							--env LETSENCRYPT_TEST=#{Smartcloud.config.letsencrypt_test} \
-							--env GIT_PROJECT_ROOT='#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner/apps/repositories' \
+							--env GIT_PROJECT_ROOT=#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner/apps/repositories \
 							--expose='9000' \
 							--volume='#{Smartcloud.config.user_home_path}/.smartcloud/config:#{Smartcloud.config.user_home_path}/.smartcloud/config' \
 							--volume='#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner:#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner' \

data/lib/smartcloud/templates/dotsmartcloud/grids/grid-runner/spawn-fcgi.conf

@@ -0,0 +1,77 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v 1.6 2009/09/28 08:38:02 bangert Exp $
+
+# DO NOT MODIFY THIS FILE DIRECTLY! CREATE A COPY AND MODIFY THAT INSTEAD!
+
+# The FCGI process can be made available through a filesystem socket or
+# through a inet socket. One and only one of the two types must be choosen.
+# Default is the inet socket.
+
+# The filename specified by
+# FCGI_SOCKET will be suffixed with a number for each child process, for
+# example, fcgi.socket-1.
+# Leave empty to use an IP socket (default). See below. Enabling this,
+# disables the IP socket.
+#
+#FCGI_SOCKET=
+
+# When using FCGI_PORT, connections will only be accepted from the following
+# address. The default is 127.0.0.1. Use 0.0.0.0 to bind to all addresses.
+#
+#FCGI_ADDRESS=
+
+# The port specified by FCGI_PORT is the port used
+# by the first child process. If this is set to 1234 then subsequent child
+# processes will use 1235, 1236, etc.
+# The default is 1234 if FCGI_SOCKET is not set
+#
+#FCGI_PORT=
+
+# The path to your FastCGI application. These sometimes carry the .fcgi
+# extension but not always. For PHP, you should usually point this to
+# /usr/bin/php-cgi.
+#
+#FCGI_PROGRAM=
+
+# The number of child processes to spawn. The default is 1.
+#
+#FCGI_CHILDREN=
+
+# If you want to run your application inside a chroot then specify the
+# directory here. Leave this blank otherwise.
+#
+#FCGI_CHROOT=
+
+# If you want to run your application from a specific directiory specify
+# it here. Leave this blank otherwise.
+#
+#FCGI_CHDIR=
+
+# The user and group to run your application as. If you do not specify these,
+# the application will be run as root:root.
+#
+#FCGI_USER=
+#FCGI_GROUP=
+
+# Additional options you might want to pass to spawn-fcgi
+#
+#FCGI_EXTRA_OPTIONS=
+
+# If your application requires additional environment variables, you may
+# specify them here. See PHP example below.
+#
+#ALLOWED_ENV="PATH"
+
+# PHP ONLY :: These two options are specific to PHP. The first is the number
+# of child processes to spawn. The second is the number of requests to be
+# served by a single PHP process before it is restarted.
+#
+#PHP_FCGI_CHILDREN=5
+#PHP_FCGI_MAX_REQUESTS=500
+#
+# For this to work you would set
+# ALLOWED_ENV="PATH PHP_FCGI_CHILDREN PHP_FCGI_MAX_REQUESTS"
+
+# GIT ONLY :: Environment Variables
+ALLOWED_ENV="GIT_PROJECT_ROOT"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.0.48
+  version: 0.0.53
 platform: ruby
 authors:
 - Timeboard
@@ -49,6 +49,7 @@ files:
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-runner/apps/repositories/.keep
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-runner/buildpacks/rails/gems/.keep
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-runner/pre-receive
+- lib/smartcloud/templates/dotsmartcloud/grids/grid-runner/spawn-fcgi.conf
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-solr/data/.keep
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-solr/data/README.txt
 - lib/smartcloud/templates/dotsmartcloud/grids/grid-solr/data/configsets/_default/conf/lang/contractions_ca.txt