Permalink
Browse files

Support /combust-healthz URL, update combust.docker.conf

  • Loading branch information...
abh committed Oct 6, 2017
1 parent d3745e7 commit e35c2fa2b952b5dd8254510f2eee30f4b0237920
Showing with 80 additions and 66 deletions.
  1. +9 −3 Dockerfile
  2. +1 −1 combust
  3. +68 −61 combust.docker.conf
  4. +2 −1 run
View
@@ -1,7 +1,13 @@
FROM quay.io/ntppool/base-os:v2.3
FROM quay.io/perl/base-os:v3.0.1
# Cache buster for occasionally resetting the cached images for the yum commands
ENV LAST_UPDATED 2017-05-30
# Note that this only builds dependencies and such, it doesn't
# actually include the site code etc itself. The site code
# includes the documents which are updated more often and we
# don't want to rebuild and restart the container each time.
# Cache buster for occasionally resetting the cached images even if
# the base doesn't cahnge.
ENV LAST_UPDATED 2017-10-03
USER root
Submodule combust updated 1 files
+11 −8 lib/Combust/App.pm
View
@@ -1,4 +1,4 @@
perl = /perl5/perls/perl-5.24.0/bin/perl
perl = /usr/bin/perl
servername = perlweb
# default port is 8225
@@ -7,25 +7,11 @@ port = 8235
# external_port. Set to a non-zero value to set the port number used
# for external redirects (301's, 302's)
#external_port = 8235
# source ip's allowed to be frontend proxies, where the
# X-Forwarded-For header is honored. Defaults to 127.0.0.1. The
# special option "*" will allow any IP to set the source IP (use only
# when the httpd is "firewalled in".
# proxyip_forwarders = 127.0.0.1, 10.15.0.10, 10.15.0.11, 10.20.0.0/24
proxyip_forwarders = 127.0.0.1, 10.0.100.0/24, 10.3.0.0/24, 10.2.0.0/16
# add Apache::Reload to the httpd configuration; good for development! (default 0)
# 0 = disabled, 1 = enabled, 2 = enabled with debugging on
apache_reload = 1
# use Template::Timer to insert timing information in the TT output (default 0)
# template_timer = 1
# path for log files and the httpd.pid file
# log_path = apache/logs
# path for temporary work files (compiled template cache etc)
# work_path = tmp
apache_reload = 0
# Gearman Job Servers (for Combust::Gearman::* / Gearman). Defaults to
# 127.0.0.1 on the default port.
@@ -35,24 +21,15 @@ apache_reload = 1
# Syntax is ip:port@weight, [ip:port@weight]
# memcached_servers = 10.50.0.100:11211@2, 10.50.0.100:11250@3
# use cronolog for logging:
# use_cronolog = 1
# activate cronologging
# cronolog_path = /usr/sbin/cronolog
# path to cronolog binary
# cronolog_template = %Y/%m/LOGFILE.%Y%m%d
# cronolog_params = -l LOGDIR/LOGFILE.latest
# access and errror will be substituted for LOGFILE in template and
# params. LOGDIR is $CBROOT/apache/logs
log_path = stdout
[database-combust]
# configure database access for use with the db_open() function
#data_source = dbi:mysql:database=combust;host=127.0.0.1
data_source = dbi:mysql:database=perlweb_production;host=127.0.0.1
#data_source = dbi:mysql:database=testxx;host=127.0.0.1
user = root
# password = very.s3cret
default=1
# mysql hostname is resolved with an ExternalName service
data_source = dbi:mysql:database=perlweb;host=mysql
user = perlweb
# use this as a template to generate the real file using something from a secret?
#password = abc
[database-cpanratings]
alias=combust
@@ -69,46 +46,76 @@ alias=combust
# Apache specific configuration
[apache]
#maxclients = 20
#keepalive = Off
#keepalivetimeout = 300
#startservers = 5
#minspareservers = 1
#maxspareservers = 10
#maxrequestsperchild = 500
#modules_add = a,b
#modules_del = c
#loglevel = debug
[www]
servername = www.perl.org
#googleanalytics = UA-xxx
#static_base = //st.pimg.net/perlweb/
deployment_mode = devel
# Configure sites
[qa]
servername = qa.perl.org
googleanalytics = UA-xxx-4
#static_base = //st.pimg.net/perlweb/
deployment_mode = devel
[noc]
servername = noc.perl.org
googleanalytics = UA-xxx-5
#static_base = //st.pimg.net/perlweb/
deployment_mode = devel
[www]
servername = 4e67500.ngrok.com
disabled = 0
[combust]
servername = combust.develooper.com
#static_base = //st.pimg.net/perlweb/
deployment_mode = devel
static_base = http://4e67500.ngrok.com/static/
[cpanratings]
servername = cpanratings.embla.bur.sol
disabled = 0
bitcard_token = 833d3ca64fd0ea2db44ad87192dc6d
[dev]
servername = dev.perl.org
googleanalytics = UA-xxx-6
#static_base = //st.pimg.net/perlweb/
deployment_mode = devel
static_base = http://perlstatic.ask.pagekite.me/
[static]
servername = perlstatic.ask.pagekite.me
[dbi]
servername = dbi.perl.org
googleanalytics = UA-xxx-7
#static_base = //st.pimg.net/perlweb/
deployment_mode = devel
static_base = http://perlstatic.ask.pagekite.me/
[dev]
servername = perl.local
[perl4lib]
servername = perl4lib.perl.org
#static_base = //st.pimg.net/perlweb/
deployment_mode = devel
[debugger]
servername = debugger.perl.org
#static_base = //st.pimg.net/perlweb/
deployment_mode = devel
[cpanratings]
servername = cpanratings.perl.org
aliases = cpanratings2.perl.org
#static_base = //st.pimg.net/perlweb/
deployment_mode = devel
static_base = http://perlstatic.ask.pagekite.me/
[learn]
servername = perl2.local
servername = learn.perl.org
googleanalytics = UA-xxx-13
#static_base = //st.pimg.net/perlweb/
deployment_mode = devel
static_base = http://perlstatic.ask.pagekite.me/
[lists]
servername = lists.perl.org
googleanalytics = UA-xxx-20
#static_base = //st.pimg.net/perlweb/
deployment_mode = devel
#[static]
#servername = static-origin.perl.org
#deployment_mode = devel
#static_base = //st.pimg.net/perlweb/
[headers-global]
X-Frame-Options = deny
X-XSS-Protection = 1
X-Content-Type-Options = nosniff
View
3 run
@@ -2,4 +2,5 @@
#
# Start a pre-built docker container. /usr/bin/run is 'container-run.sh' script from docker.
#
docker run --rm -P -p 8235:8235 -t -i -v `pwd`:/perlweb quay.io/abh/perlweb:v1 /usr/bin/run
IMAGE=quay.io/perl/perlweb:latest
docker run --rm -P -p 8235:8235 -t -i -v `pwd`:/perlweb $IMAGE /usr/bin/run

0 comments on commit e35c2fa

Please sign in to comment.