smartcloud 0.0.46 → 0.0.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a1ccd07b6d054b992cb27529c89599aa585822fc2bfdc5f5087ff5c87d3a6b0
-  data.tar.gz: 7a71319b8c202d7d15ad46b3b3be03e034d7aa80e49d5f7c21b082b8abb6bede
+  metadata.gz: e719514b799812fee2b0af6238b7e3a1e713697d950e01fc09ad0ad82b04663b
+  data.tar.gz: 882cc6074f679a9ff67d3deffe4375b276524569931ce1e76946c7c0f7c6bf02
 SHA512:
-  metadata.gz: 27ab45ab9b9e6ccf2b81810ad3333e58600b06a1de5daa9a26aa58e837ca65ad5dbe08aea7d44e50d31e344ae149ef5b0deda7a8053f0e14dd583f0c50e2bded
-  data.tar.gz: ff0ef27f9ba830c36776c51c039a3c7c1f5f72a407667f10a850cf09fdf62cbe2b041415ed6be450dc0ff7b003ac1d6d7e278c54b4ca3874ba5f15e2cbdb0a45
+  metadata.gz: f22aaa740be0bb01a47a8765e12a849ad27f8b75a4bd65e4d4e921ac639429fb72ab325fc4d00c713aab6484ccc28ea0480237cb9d9e993a804a034cfe6c49b4
+  data.tar.gz: 45983a982f00d9cfc8bf4a68388756e35b1ce6dc4708d3d42d2792b6fa242e70c1e8491e7104e8f7a44a4623aea1964d6abb3badcce237ed4a8241e4827b7c40

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

@@ -4,6 +4,8 @@ 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 GIT_PROJECT_ROOT /.smartcloud/grids/grid-runner/apps/repositories; # is the location of all of your git repositories.
 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 as environment variables in the runner container and hence need not be passed here.

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,6 +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_ROO=#{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.46
+  version: 0.0.51
 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