Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

production buildout improvements

svn path=/plumi.app/trunk/; revision=227263
  • Loading branch information...
commit ec239b2b09f36089fcfd10da999b4fd57ce6597a 1 parent bad2c10
@d-mo d-mo authored
View
12 base.cfg
@@ -48,19 +48,14 @@ parts =
qt-faststart
lxml
-# diazo
-
nginx-build
varnish-build
haproxy-build
cache
main-config
- videoserver-config
cache-config
-# transform-config
balancer-config
-# compile-theme
logrotate.conf
@@ -85,6 +80,11 @@ eggs =
Scons
develop = .
+ src/collective.contentlicensing
+ src/plumi.content
+ src/plumi.skin
+ src/plumi.locales
+
# Project-specific version pins.
@@ -125,6 +125,8 @@ eggs =
plone.reload
plumi.app
plumi.skin
+ collective.contentlicensing
+ plone.app.caching
${site:eggs}
zcml =
View
31 build.cfg
@@ -242,17 +242,6 @@ recipe = collective.recipe.template
input = ${buildout:directory}/production/main.conf.template
output = ${buildout:directory}/production/main.conf
-[videoserver-config]
-recipe = collective.recipe.template
-input = ${buildout:directory}/production/videoserver.conf.template
-output = ${buildout:directory}/production/videoserver.conf
-
-#[compile-theme]
-#recipe = plone.recipe.command
-#command =
-# ${buildout:directory}/bin/xdvcompiler -t ${theme:theme} -r ${theme:rules} -a ${theme:absolute-prefix} ${theme:output-xslt}
-#update-command = ${compile-theme:command}
-
##############################################################################
# Configure Varnish cache
##############################################################################
@@ -300,16 +289,16 @@ user = ${site:supervisor-user}
password = ${site:supervisor-pass}
serverurl = http://${site:supervisor-host}:${site:supervisor-port}
programs =
- 10 zeo ${zeoserver:location}/bin/runzeo true ${site:zeo-user}
- 20 instance1 ${buildout:directory}/parts/instance1/bin/runzope true ${site:zope-user}
- 20 instance2 ${buildout:directory}/parts/instance2/bin/runzope true ${site:zope-user}
- 20 instance3 ${buildout:directory}/parts/instance3/bin/runzope true ${site:zope-user}
- 20 instance4 ${buildout:directory}/parts/instance4/bin/runzope true ${site:zope-user}
- 30 balancer ${buildout:directory}/bin/haproxy [-f ${buildout:directory}/production/balancer.conf -db] true ${site:balancer-user}
-# 40 transform ${nginx-build:location}/sbin/nginx [-c ${buildout:directory}/production/transform.conf] true ${site:transform-user}
- 50 cache ${buildout:directory}/bin/cache true ${site:cache-user}
- 60 main ${nginx-build:location}/sbin/nginx [-c ${buildout:directory}/production/main.conf] true
-
+ 10 zeo ${zeoserver:location}/bin/runzeo true ${site:zeo-user}
+ 20 transcodedaemon ${buildout:directory}/bin/transcodedaemon [fg] true ${site:transcode-user}
+ 30 ploneftp ${buildout:directory}/bin/ploneftp [fg] true ${site:ftp-user}
+ 40 instance1 ${buildout:directory}/bin/instance1 [console] true ${site:zope-user}
+ 50 instance2 ${buildout:directory}/bin/instance2 [console] true ${site:zope-user}
+ 60 instance3 ${buildout:directory}/bin/instance3 [console] true ${site:zope-user}
+ 70 instance4 ${buildout:directory}/bin/instance4 [console] true ${site:zope-user}
+ 80 balancer ${buildout:directory}/bin/haproxy [-f ${buildout:directory}/production/balancer.conf -db] true ${site:balancer-user}
+ 90 cache ${buildout:directory}/bin/cache true ${site:cache-user}
+ 100 main ${nginx-build:location}/sbin/nginx [-c ${buildout:directory}/production/main.conf]
##############################################################################
# Log rotation
##############################################################################
View
1  docs/INSTALL.txt
@@ -2,6 +2,7 @@ Before you start
================
* install gcc/g++ dev tools (e.g. sudo apt-get install build-essential)
+ * install yasm (e.g. sudo apt-get install yasm)
* install python2.6 and header files (e.g. sudo apt-get install python2.6-dev)
View
13 production.cfg
@@ -9,7 +9,7 @@
#
[buildout]
-extensions = buildout.dumppickedversions
+extensions = buildout.dumppickedversions mr.developer
dump-picked-versions-file = versions/last-production-versions.cfg
# Pin ourselves to the versions previously built in a devel.cfg configuration
@@ -18,3 +18,14 @@ extends =
base.cfg
versions/known-good-versions.cfg
+develop = src/collective.contentlicensing
+ src/plumi.content
+ src/plumi.skin
+ src/plumi.locales
+ .
+
+[sources]
+plumi.content = svn https://svn.plone.org/svn/collective/plumi.content/trunk
+plumi.skin = svn https://svn.plone.org/svn/collective/plumi.skin/trunk
+plumi.locales = svn https://svn.plone.org/svn/collective/plumi.locales/trunk
+collective.contentlicensing = svn https://svn.plone.org/svn/collective/collective.contentlicensing/branches/plone4_compatibility/
View
26 production/main.conf.template
@@ -15,6 +15,7 @@ lock_file ${buildout:directory}/var/main.lock;
worker_processes 1;
daemon off;
+
events {
worker_connections 1024;
}
@@ -28,8 +29,9 @@ error_log ${buildout:directory}/var/log/main-error.log warn;
http {
- # Define Varnish upstream
+ server_names_hash_bucket_size 128;
+ # Define Varnish upstream
upstream cache {
server ${site:cache-address};
}
@@ -49,9 +51,29 @@ http {
# Proxy everything to Varnish
location / {
- proxy_pass http://cache;
+ proxy_pass http://cache/VirtualHostBase/http/${site:www-server-name}:80/${site:portal-id}/VirtualHostRoot/;
+ proxy_connect_timeout 75;
+ proxy_read_timeout 185;
+ }
+ }
+
+ upstream transcoder {
+ server ${site:transcode-host}:${site:transcode-port};
+ }
+
+ server {
+ listen ${site:www-address};
+ server_name ${site:www-videoserver-name};
+ access_log ${buildout:directory}/var/log/videoserver-access.log;
+
+ location / {
+ proxy_pass http://transcoder;
proxy_connect_timeout 75;
proxy_read_timeout 185;
}
+
+ location /transcoded {
+ root ${buildout:directory}/;
+ }
}
}
View
57 production/videoserver.conf.template
@@ -1,57 +0,0 @@
-# This is the default nginx configuration for the front-most web server,
-# typically running on port 80. It is mainly responsible for proxying to
-# the Varnish cache.
-#
-# Note that main.conf is generated from main.conf.template.
-#
-
-
-# Process control
-
-user ${site:www-user};
-pid ${buildout:directory}/var/main.pid;
-lock_file ${buildout:directory}/var/main.lock;
-
-worker_processes 1;
-daemon off;
-
-events {
- worker_connections 1024;
-}
-
-
-# Logging
-
-error_log ${buildout:directory}/var/log/main-error.log warn;
-
-# HTTP server
-
-http {
-
- # Define Varnish upstream
-
- upstream cache {
- server ${site:cache-address};
- }
-
- server {
- listen ${site:www-address};
- server_name ${site:www-videoserver-name};
- access_log ${buildout:directory}/var/log/main-plone-access.log;
-
- # Show status information on /_main-status
- location = /_main_status_ {
- stub_status on;
- allow 127.0.0.1;
- deny all;
- }
-
- # Proxy everything to Varnish
-
- location / {
- proxy_pass http://cache;
- proxy_connect_timeout 75;
- proxy_read_timeout 185;
- }
- }
-}
View
15 site.cfg
@@ -5,6 +5,9 @@ arch = linux32
# the default Administrator's username and password
user = admin:admin
+# the id of your plumi site
+portal-id = Plone
+
# the address where ZEO will be listening on
zeo-address = localhost:8100
@@ -15,7 +18,10 @@ instance-debug-address = localhost:8080
instance-ftp = localhost:8021
# the public ftp address of plumiftp. By default any ip, port 21, which requires root privileges to start
-plumiftp-address = 21
+plumiftp-address = *:21
+
+# change that if not using port 21
+ftp-user = root
# the addresses of the zope instances
instance1-address = localhost:8081
@@ -33,9 +39,10 @@ instance4-icp = localhost:8094
# hostname and port for transcode daemon
transcode-host = localhost
transcode-port = 8888
+transcode-user = daemon
# varnish user and address to listen to
-cache-user = varnish
+cache-user = root
cache-address = localhost:8090
# hostname, port and credentials for supervisor
@@ -47,14 +54,14 @@ supervisor-pass = supervp
# haproxy port and host
balancer-host = localhost
balancer-port = 8089
-balancer-user = haproxy
+balancer-user = proxy
# syslog address
syslog-host = localhost
# web server user
www-user = www-data
-www-address = *:80
+www-address = 80
www-server-name = testing.plumi.org
www-videoserver-name = videos.testing.plumi.org
View
12 versions/last-production-versions.cfg
@@ -0,0 +1,12 @@
+[versions]
+PILwoTk = 1.1.6.4
+collective.recipe.backup = 1.6
+collective.recipe.template = 1.8
+plone.recipe.haproxy = 1.1.1
+plone.recipe.varnish = 1.1
+scons = 2.0.1
+z3c.recipe.staticlxml = 0.7.2
+
+#Required by:
+#z3c.recipe.staticlxml 0.7.2
+zc.recipe.cmmi = 1.3.3
Please sign in to comment.
Something went wrong with that request. Please try again.