Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
slapos
Commits
87e598d9
Commit
87e598d9
authored
Feb 08, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into slapos
parents
df8a5b1d
e9e8b1d5
Changes
20
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
180 additions
and
106 deletions
+180
-106
CHANGES.txt
CHANGES.txt
+21
-0
component/apache/buildout.cfg
component/apache/buildout.cfg
+1
-1
component/cloud9/buildout.cfg
component/cloud9/buildout.cfg
+1
-1
component/libreoffice-bin/buildout.cfg
component/libreoffice-bin/buildout.cfg
+2
-2
component/mariadb/buildout.cfg
component/mariadb/buildout.cfg
+2
-2
component/rpm2cpio/buildout.cfg
component/rpm2cpio/buildout.cfg
+1
-2
component/tomcat/buildout.cfg
component/tomcat/buildout.cfg
+4
-4
setup.py
setup.py
+1
-1
slapos/recipe/apachephp/__init__.py
slapos/recipe/apachephp/__init__.py
+2
-0
slapos/recipe/generatepassword.py
slapos/recipe/generatepassword.py
+7
-5
slapos/recipe/librecipe/generic.py
slapos/recipe/librecipe/generic.py
+3
-3
slapos/recipe/postgres/__init__.py
slapos/recipe/postgres/__init__.py
+5
-4
slapos/recipe/slapconfiguration.py
slapos/recipe/slapconfiguration.py
+4
-4
software/lamp-template/template/phpmyadmin.inc.php.in
software/lamp-template/template/phpmyadmin.inc.php.in
+3
-5
software/postgres/instance.cfg.in
software/postgres/instance.cfg.in
+18
-2
software/postgres/software.cfg
software/postgres/software.cfg
+17
-7
software/slaprunner/software.cfg
software/slaprunner/software.cfg
+27
-19
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+40
-38
stack/lapp/buildout.cfg
stack/lapp/buildout.cfg
+1
-1
stack/lapp/postgres/instance-postgres.cfg.in
stack/lapp/postgres/instance-postgres.cfg.in
+20
-5
No files found.
CHANGES.txt
View file @
87e598d9
Changes
=======
0.71.4 (2013-02-01)
-------------------
* Enable IPv6 support in KumoFS. [Vincent Pelletier]
* Use new connection and get result when try to create new erp5 site. [Rafael Monnerat]
* Set up timezone database in mariab's mysql table so that we can use timezone conversion function. [Kazuhiko Shiozaki]
* Make erp5_bootstrap wait for manage_addERP5Site response [Rafael Monnerat]
0.71.3 (2013-01-31)
-------------------
* Add mysql_ip and mysql_port parameters in apachephp recipe [Cedric de Saint
Martin]
* Random password for postgres in standalone SR and lapp stack; accept
connections from the world. [Marco Mariani]
0.71.2 (2013-01-29)
-------------------
* revised postgres/lapp recipe. [Marco Mariani]
0.71.1 (2013-01-04)
-------------------
...
...
component/apache/buildout.cfg
View file @
87e598d9
...
...
@@ -31,7 +31,7 @@ recipe = hexagonit.recipe.cmmi
depends =
${gdbm:version}
version = 2.4.3
revision =
1
revision =
2
url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
md5sum = 87aaf7bc7e8715f0455997bb8c6791aa
configure-command = cp -ar ${apr:location}/apr-${apr:version} srclib/apr/; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util; ./configure
...
...
component/cloud9/buildout.cfg
View file @
87e598d9
...
...
@@ -51,7 +51,7 @@ md5sum = 5dc8cc28447ed3747b8a53c768d872aa
# NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location}
recipe = plone.recipe.command
stop-on-error = true
commit =
6b0112363dd0f9523430808394a162d3cc699550
commit =
9158bbf9e886e3b96e91239249aca66e420aa8d1
repository = https://github.com/ajaxorg/cloud9.git
location = ${buildout:parts-directory}/${:_buildout_section_name_}
environment = export GIT_SSL_NO_VERIFY=true; export PATH=${git:location}/bin:${nodejs:location}/bin:${node-sm:location}/node_modules/sm/bin:$PATH; export CPPFLAGS="-I${libxml2:location}/include -I${nodejs:location}/include"; export LDFLAGS="-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib"; export HOME=${:location};
...
...
component/libreoffice-bin/buildout.cfg
View file @
87e598d9
...
...
@@ -13,8 +13,8 @@ find-links =
recipe = slapos.recipe.build
# here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
version = 3.5.6
url = http://download.documentfoundation.org/libreoffice/stable/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
#
url = http://download.documentfoundation.org/libreoffice/stable/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
url = http://ftp.psu.ac.th/pub/libreoffice/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
# supported architectures md5sums
md5sum_x86 = 079609188b86ede3b3eebe2b75862b31
md5sum_x86-64 = 6a559fa9c62c810464254d129bd2dc17
...
...
component/mariadb/buildout.cfg
View file @
87e598d9
...
...
@@ -25,10 +25,10 @@ download-only = true
[mariadb]
recipe = hexagonit.recipe.cmmi
version = 5.5.2
5
version = 5.5.2
8a
revision = 1
url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
md5sum =
943f67c267d73a4080ab497e11740daf
md5sum =
a2d20a040ef1e49944a4ffe65ed7fefa
# compile directory is required to build mysql plugins.
keep-compile-dir = true
patch-options = -p0
...
...
component/rpm2cpio/buildout.cfg
View file @
87e598d9
...
...
@@ -3,7 +3,6 @@ parts =
rpm2cpio
[rpm2cpio]
recipe = hexagonit.recipe.download
download-only = true
recipe = slapos.recipe.build:download
url = https://raw.github.com/ruda/rpm2cpio/e196173f1f6b746463b7398e381b94a42edfa345/rpm2cpio.py
md5sum = c5bb6227d99e1ff5df880f997cbed2e3
component/tomcat/buildout.cfg
View file @
87e598d9
...
...
@@ -12,11 +12,11 @@ parts =
[tomcat6]
recipe = hexagonit.recipe.download
strip-top-level-dir = true
url = http://apache.multidist.com/tomcat/tomcat-6/v6.0.3
5/bin/apache-tomcat-6.0.35
.tar.gz
md5sum =
171d255cd60894b29a41684ce0ff93a8
url = http://apache.multidist.com/tomcat/tomcat-6/v6.0.3
6/bin/apache-tomcat-6.0.36
.tar.gz
md5sum =
3dde098fd0b3a08d3f2867e4a95591ba
[tomcat7]
recipe = hexagonit.recipe.download
strip-top-level-dir = true
url = http://apache.multidist.com/tomcat/tomcat-7/v7.0.
25/bin/apache-tomcat-7.0.25
.tar.gz
md5sum =
2aa59d23555d641b20efad4aed86b693
url = http://apache.multidist.com/tomcat/tomcat-7/v7.0.
34/bin/apache-tomcat-7.0.34
.tar.gz
md5sum =
0f50494425c24450b4f66dfd4d2aecca
setup.py
View file @
87e598d9
...
...
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
import
glob
import
os
version
=
'0.71.
2-dev
'
version
=
'0.71.
4
'
name
=
'slapos.cookbook'
long_description
=
open
(
"README.txt"
).
read
()
+
"
\
n
"
+
\
open
(
"CHANGES.txt"
).
read
()
+
"
\
n
"
...
...
slapos/recipe/apachephp/__init__.py
View file @
87e598d9
...
...
@@ -98,6 +98,8 @@ class Recipe(GenericBaseRecipe):
mysql_password
=
self
.
options
[
'mysql-password'
],
mysql_host
=
'%s:%s'
%
(
self
.
options
[
'mysql-host'
],
self
.
options
[
'mysql-port'
]),
mysql_ip
=
self
.
options
[
'mysql-host'
],
mysql_port
=
self
.
options
[
'mysql-port'
],
secret_key
=
secret_key
,
)
...
...
slapos/recipe/generatepassword.py
View file @
87e598d9
# vim: set et sts=2:
##############################################################################
#
# Copyright (c) 2012 Vifib SARL and Contributors. All Rights Reserved.
...
...
@@ -24,12 +25,13 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
import
random
import
os
import
binascii
import
os
from
slapos.recipe.librecipe
import
GenericBaseRecipe
class
Recipe
(
GenericBaseRecipe
):
def
__init__
(
self
,
buildout
,
name
,
options
):
...
...
@@ -44,7 +46,7 @@ class Recipe(GenericBaseRecipe):
return
GenericBaseRecipe
.
__init__
(
self
,
buildout
,
name
,
options
)
def
install
(
self
):
open_file
=
open
(
self
.
options
[
'storage-path'
],
'w'
)
open_file
.
write
(
self
.
options
[
'passwd'
])
open_file
.
close
()
with
open
(
self
.
options
[
'storage-path'
],
'w'
)
as
fout
:
fout
.
write
(
self
.
options
[
'passwd'
])
return
[
self
.
options
[
'storage-path'
]]
slapos/recipe/librecipe/generic.py
View file @
87e598d9
...
...
@@ -98,9 +98,9 @@ class GenericBaseRecipe(object):
line must be unicode."""
try
:
lines
=
io
.
open
(
filepath
,
'r'
,
encoding
=
encoding
).
readlines
()
e
xcept
IOError
:
if
os
.
path
.
exists
(
filepath
)
:
lines
=
[
l
.
rstrip
(
'
\
n
'
)
for
l
in
io
.
open
(
filepath
,
'r'
,
encoding
=
encoding
)]
e
lse
:
lines
=
[]
if
not
line
in
lines
:
...
...
slapos/recipe/postgres/__init__.py
View file @
87e598d9
...
...
@@ -70,8 +70,7 @@ class Recipe(GenericBaseRecipe):
"""
def
_options
(
self
,
options
):
options
[
'password'
]
=
self
.
generatePassword
()
options
[
'url'
]
=
'postgresql://%(superuser)s:%(password)s@[%(ipv6_random)s]:%(port)s/%(dbname)s'
%
options
options
[
'url'
]
=
'postgresql://%(superuser)s:%(password)s@[%(ipv6-random)s]:%(port)s/%(dbname)s'
%
options
def
install
(
self
):
...
...
@@ -160,11 +159,13 @@ class Recipe(GenericBaseRecipe):
'host all all ::1/128 md5'
,
]
ipv4_netmask_bits
=
self
.
options
.
get
(
'ipv4-netmask-bits'
,
'32'
)
for
ip
in
ipv4
:
cfg_lines
.
append
(
'host all all %s/
32 md5'
%
ip
)
cfg_lines
.
append
(
'host all all %s/
%s md5'
%
(
ip
,
ipv4_netmask_bits
)
)
ipv6_netmask_bits
=
self
.
options
.
get
(
'ipv6-netmask-bits'
,
'128'
)
for
ip
in
ipv6
:
cfg_lines
.
append
(
'host all all %s/
128 md5'
%
ip
)
cfg_lines
.
append
(
'host all all %s/
%s md5'
%
(
ip
,
ipv6_netmask_bits
)
)
cfg
.
write
(
'
\
n
'
.
join
(
cfg_lines
))
...
...
slapos/recipe/slapconfiguration.py
View file @
87e598d9
...
...
@@ -64,9 +64,9 @@ class Recipe(object):
Set of IPv4 addresses.
ipv6
Set of IPv6 addresses.
ipv4
_
random
ipv4
-
random
One of the IPv4 addresses.
ipv6
_
random
ipv6
-
random
One of the IPv6 addresses.
tap
Set of TAP interfaces.
...
...
@@ -116,9 +116,9 @@ class Recipe(object):
# also export single ip values for those recipes that don't support sets.
if
ipv4_set
:
options
[
'ipv4
_
random'
]
=
list
(
ipv4_set
)[
0
]
options
[
'ipv4
-
random'
]
=
list
(
ipv4_set
)[
0
]
if
ipv6_set
:
options
[
'ipv6
_
random'
]
=
list
(
ipv6_set
)[
0
]
options
[
'ipv6
-
random'
]
=
list
(
ipv6_set
)[
0
]
options
[
'tap'
]
=
tap_set
options
[
'configuration'
]
=
parameter_dict
...
...
software/lamp-template/template/phpmyadmin.inc.php.in
View file @
87e598d9
...
...
@@ -5,13 +5,11 @@ $i = 1;
/* Server parameters */
$cfg
[
'Servers'
][
$i
][
'host'
]
=
'Put here mysql host template key'
;
$cfg
[
'Servers'
][
$i
][
'port'
]
=
'Put here mysql port template key'
;
$cfg
[
'Servers'
][
$i
][
'only_db'
]
=
'Put here mysql database template key'
;
/* Authentication type */
$cfg
[
'Servers'
][
$i
][
'auth_type'
]
=
'cookie'
;
$cfg
[
'Servers'
][
$i
][
'user'
]
=
''
;
$cfg
[
'Servers'
][
$i
][
'connect_type'
]
=
'tcp'
;
$cfg
[
'Servers'
][
$i
][
'compress'
]
=
false
;
/* Select mysqli if your server has it */
$cfg
[
'Servers'
][
$i
][
'extension'
]
=
'mysql'
;
$cfg
[
'Servers'
][
$i
][
'extension'
]
=
'mysqli'
;
$cfg
[
'Servers'
][
$i
][
'AllowNoPassword'
]
=
false
;
/* rajk - for blobstreaming */
...
...
software/postgres/instance.cfg.in
View file @
87e598d9
...
...
@@ -16,6 +16,7 @@ offline = true
recipe = slapos.cookbook:mkdirectory
bin = $${buildout:directory}/bin
etc = $${buildout:directory}/etc
srv = $${buildout:directory}/srv
services = $${directories:etc}/service
promises = $${directories:etc}/promise
var = $${buildout:directory}/var
...
...
@@ -30,9 +31,14 @@ recipe = slapos.cookbook:postgres
# Options
ipv6 = $${instance-parameters:ipv6}
# listen to connections from anywhere
ipv6-netmask-bits = 0
ipv4 = $${instance-parameters:ipv4}
ipv6_random = $${instance-parameters:ipv6_random}
# listen to connections from anywhere
ipv4-netmask-bits = 0
ipv6-random = $${instance-parameters:ipv6-random}
superuser = postgres
password = $${gen-passwd:passwd}
port = 5432
dbname = db
# pgdata_directory is created by initdb, and should not exist beforehand.
...
...
@@ -41,6 +47,16 @@ bin = ${postgresql:location}/bin
services = $${directories:services}
#----------------
#--
#-- Generates a random password and stores it in the filesystem
[gen-passwd]
recipe = slapos.cookbook:generate.password
storage-path = $${directories:srv}/postgres_passwd
bytes = 16
#----------------
#--
#-- Deploy promise scripts.
...
...
@@ -48,7 +64,7 @@ services = $${directories:services}
[postgres-promise]
recipe = slapos.cookbook:check_port_listening
path = $${directories:promises}/postgres
hostname = $${instance-parameters:ipv6
_
random}
hostname = $${instance-parameters:ipv6
-
random}
port = $${postgres-instance:port}
...
...
software/postgres/software.cfg
View file @
87e598d9
...
...
@@ -17,7 +17,7 @@ parts =
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg
md5sum = d
fba09a7cccefc5d92d455aaed2c1835
md5sum = d
8b833a2054b82b6031a9420008b58fd
mode = 0644
...
...
@@ -25,18 +25,19 @@ mode = 0644
Jinja2 = 2.6
Werkzeug = 0.8.3
buildout-versions = 1.7
cns.recipe.symlink = 0.2.3
hexagonit.recipe.cmmi = 1.6
inotifyx = 0.2.0
lxml = 3.1beta1
meld3 = 0.6.10
netaddr = 0.7.10
pytz = 2012j
slapos.cookbook = 0.71.2
slapos.core = 0.34
slapos.recipe.template = 2.4.2
xml-marshaller = 0.9.7
# Required by:
# slapos.core==0.3
3.1
# slapos.core==0.3
4
Flask = 0.9
# Required by:
...
...
@@ -44,21 +45,30 @@ Flask = 0.9
hexagonit.recipe.download = 1.6
# Required by:
# slapos.core==0.3
3.1
# slapos.core==0.3
4
netifaces = 0.8
# Required by:
# cns.recipe.symlink==0.2.3
# slapos.core==0.34
pyflakes = 0.6.0
# Required by:
# slapos.cookbook==0.71.2
# slapos.core==0.34
# supervisor==3.0b1
# zc.buildout==1.6.0-dev-SlapOS-010
# zope.interface==4.0.3
setuptools = 0.6c12dev-r88846
# Required by:
# slapos.core==0.3
3.1
# slapos.core==0.3
4
supervisor = 3.0b1
# Required by:
# slapos.core==0.33.1
# slapos.core==0.34
unittest2 = 0.5.1
# Required by:
# slapos.core==0.34
zope.interface = 4.0.3
software/slaprunner/software.cfg
View file @
87e598d9
...
...
@@ -55,32 +55,32 @@ meld3 = 0.6.10
netaddr = 0.7.10
plone.recipe.command = 1.1
pycrypto = 2.6
pytz = 2012
h
slapos.cookbook = 0.7
0
slapos.core = 0.3
3.1
pytz = 2012
j
slapos.cookbook = 0.7
1.1
slapos.core = 0.3
4
slapos.libnetworkcache = 0.13.3
slapos.recipe.build = 0.11.5
slapos.recipe.template = 2.4.2
slapos.toolbox = 0.3
2
slapos.toolbox = 0.3
3
smmap = 0.8.2
xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1
# Required by:
# slapos.core==0.3
3.1
# slapos.toolbox==0.3
2
# slapos.core==0.3
4
# slapos.toolbox==0.3
3
Flask = 0.9
# Required by:
# slapos.toolbox==0.3
2
# slapos.toolbox==0.3
3
GitPython = 0.3.2.RC1
# Required by:
# slapos.toolbox==0.3
2
# slapos.toolbox==0.3
3
atomize = 0.1.1
# Required by:
# slapos.toolbox==0.3
2
# slapos.toolbox==0.3
3
feedparser = 5.1.3
# Required by:
...
...
@@ -88,32 +88,40 @@ feedparser = 5.1.3
hexagonit.recipe.download = 1.6
# Required by:
# slapos.core==0.3
3.1
# slapos.core==0.3
4
netifaces = 0.8
# Required by:
# slapos.toolbox==0.3
2
# slapos.toolbox==0.3
3
paramiko = 1.9.0
# Required by:
# slapos.toolbox==0.3
2
# slapos.toolbox==0.3
3
psutil = 0.6.1
# Required by:
# slapos.core==0.34
pyflakes = 0.5.0
# Required by:
# cns.recipe.symlink==0.2.3
# slapos.cookbook==0.7
0
# slapos.core==0.3
3.1
# slapos.cookbook==0.7
1.1
# slapos.core==0.3
4
# slapos.libnetworkcache==0.13.3
# slapos.toolbox==0.3
2
# slapos.toolbox==0.3
3
# supervisor==3.0b1
# zc.buildout==1.6.0-dev-SlapOS-010
# zope.interface==4.0.
2
# zope.interface==4.0.
3
setuptools = 0.6c12dev-r88846
# Required by:
# slapos.core==0.3
3.1
# slapos.core==0.3
4
supervisor = 3.0b1
# Required by:
# slapos.core==0.33.1
zope.interface = 4.0.2
# slapos.core==0.34
unittest2 = 0.5.1
# Required by:
# slapos.core==0.34
zope.interface = 4.0.3
stack/erp5/buildout.cfg
View file @
87e598d9
...
...
@@ -572,83 +572,85 @@ Products.CMFDefault = 2.2.2
Products.CMFTopic = 2.2.1
Products.CMFUid = 2.2.1
# Unpined locally developed egg
slapos.cookbook =
# Pinned versions
Flask = 0.9
GitPython = 0.3.2.RC1
MySQL-python = 1.2.3
MySQL-python = 1.2.4
PIL = 1.1.7
Paste = 1.7.5.1
PasteDeploy = 1.5.0
PasteScript = 1.7.5
Products.CMFActionIcons = 2.1.3
Products.DCWorkflowGraph = 0.4.1
Products.ExternalEditor = 1.1.0
Products.GenericSetup = 1.7.2
Products.MimetypesRegistry = 2.0.3
Products.PluggableAuthService = 1.8.0
Products.GenericSetup = 1.7.3
Products.LongRequestLogger = 1.1.0
Products.MimetypesRegistry = 2.0.4
Products.PluggableAuthService = 1.9.0
Products.PluginRegistry = 1.3
Products.TIDStorage = 5.4.8
Products.Zelenium = 1.0.3
StructuredText = 2.11.1
WSGIUtils = 0.7
WebOb = 1.2.3
Werkzeug = 0.8.3
apache-libcloud = 0.11.1
argparse = 1.2.1
apache-libcloud = 0.11.4
async = 0.6.1
atomize = 0.1.1
buildout-versions = 1.7
cElementTree = 1.0.5-20051216
chardet = 1.1
coverage = 3.
5.2
chardet =
2.
1.1
coverage = 3.
6
csp-eventlet = 0.7.0
elementtree = 1.2.7-20070827-preview
erp5.recipe.cmmiforcei686 = 0.1.3
erp5.util = 0.4.
7
erp5.util = 0.4.
22
erp5diff = 0.8.1.5
eventlet = 0.9.17
feedparser = 5.1.2
eventlet = 0.12.1
five.localsitemanager = 2.0.5
fpconst = 0.7.2
gitdb = 0.5.4
greenlet = 0.4.0
hexagonit.recipe.cmmi = 1.6
http-parser = 0.7.
8
http-parser = 0.7.
12
huBarcode = 0.63
inotifyx = 0.2.0
ipdb = 0.7
ipython = 0.13
meld3 = 0.6.8
netaddr = 0.7.9
netifaces = 0.8
ipython = 0.13.1
meld3 = 0.6.10
ordereddict = 1.1
paramiko = 1.7.7.2
plone.recipe.command = 1.1
ply = 3.4
polib = 1.0.0
psutil = 0.6.1
polib = 1.0.2
python-ldap = 2.4.10
python-magic = 0.4.3
python-memcached = 1.47
python-memcached = 1.47-ipv6-1
qrcode = 2.4.2
requests = 1.1.0
restkit = 4.2.0
rtjp-eventlet = 0.3.2
setuptools = 0.6c12dev-r88846
slapos.core = 0.28
slapos.recipe.build = 0.10
slapos.recipe.build = 0.11.5
slapos.recipe.template = 2.4.2
slapos.toolbox = 0.
29
slapos.toolbox = 0.
33
smmap = 0.8.2
socketpool = 0.5.2
supervisor = 3.0a12
threadframe = 0.2
timerserver = 2.0.2
urlnorm = 1.1.2
uuid = 1.30
validictory = 0.8.3
xml-marshaller = 0.9.7
validictory = 0.9.0
xupdate-processor = 0.4
mr.developer = 1.21
qrcode = 2.4.1
requests = 0.13.2
Flask = 0.9
GitPython = 0.3.2.RC1
PasteDeploy = 1.5.0
argparse = 1.2.1
atomize = 0.1.1
feedparser = 5.1.3
fpconst = 0.7.2
hexagonit.recipe.download = 1.6
inotifyx = 0.2.0
netaddr = 0.7.10
netifaces = 0.8
nose = 1.2.1
paramiko = 1.9.0
psutil = 0.6.1
pyflakes = 0.6.1
slapos.core = 0.34
supervisor = 3.0b1
xml-marshaller = 0.9.7
setuptools = 0.6c12dev-r88846
stack/lapp/buildout.cfg
View file @
87e598d9
...
...
@@ -87,7 +87,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/postgres/instance-postgres.cfg.in
output = ${buildout:directory}/instance-postgres.cfg
md5sum =
6e9e587ddb52fb9a3817fda7d77e4cab
md5sum =
a2370d9a23e436166b20203f66412608
mode = 0644
[instance-postgres-import]
...
...
stack/lapp/postgres/instance-postgres.cfg.in
View file @
87e598d9
...
...
@@ -134,9 +134,9 @@ config-file = $${directory:stunnel-conf}/stunnel.conf
key-file = $${directory:stunnel-conf}/stunnel.key
cert-file = $${directory:stunnel-conf}/stunnel.crt
pid-file = $${basedirectory:run}/stunnel.pid
local-host = $${instance-parameters:ipv4
_
random}
local-host = $${instance-parameters:ipv4
-
random}
local-port = $${postgres-instance:port}
remote-host = $${instance-parameters:ipv6
_
random}
remote-host = $${instance-parameters:ipv6
-
random}
remote-port = 6446
client = false
post-rotate-script = $${rootdirectory:bin}/stunnel_post_rotate
...
...
@@ -173,9 +173,14 @@ crl = $${directory:ca-dir}/crl/
[postgres-instance]
recipe = slapos.cookbook:postgres
ipv6 = $${instance-parameters:ipv6}
# listen to connections from anywhere
ipv6-netmask-bits = 0
ipv4 = $${instance-parameters:ipv4}
ipv6_random = $${instance-parameters:ipv6_random}
# listen to connections from anywhere
ipv4-netmask-bits = 0
ipv6-random = $${instance-parameters:ipv6-random}
superuser = postgres
password = $${postgres-passwd:passwd}
port = 5432
dbname = db
# pgdata_directory is created by initdb, and should not exist beforehand.
...
...
@@ -193,6 +198,16 @@ key-file = $${stunnel:key-file}
cert-file = $${stunnel:cert-file}
#----------------
#--
#-- Generates a random password and stores it in the filesystem
[postgres-passwd]
recipe = slapos.cookbook:generate.password
storage-path = $${rootdirectory:srv}/postgres_passwd
bytes = 16
#----------------
#--
#-- Deploy slapmonitor.
...
...
@@ -218,7 +233,7 @@ path = $${directory:report}/slapmonitor-xml
[postgres-promise]
recipe = slapos.cookbook:check_port_listening
path = $${basedirectory:promises}/postgres
hostname = $${instance-parameters:ipv6
_
random}
hostname = $${instance-parameters:ipv6
-
random}
port = $${postgres-instance:port}
...
...
@@ -229,7 +244,7 @@ port = $${postgres-instance:port}
[urls]
recipe = slapos.cookbook:publish
url = $${postgres-instance:url}
ip = $${instance-parameters:ipv6
_
random}
ip = $${instance-parameters:ipv6
-
random}
#----------------
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment