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
Cédric Le Ninivin
slapos
Commits
9e03b171
Commit
9e03b171
authored
Jan 07, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
listen on all provided ip addresses; ipv4/v6 support cleanup
parent
9f1f0759
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
43 deletions
+37
-43
slapos/recipe/postgres/__init__.py
slapos/recipe/postgres/__init__.py
+22
-29
software/postgres/instance.cfg.in
software/postgres/instance.cfg.in
+4
-3
software/postgres/software.cfg
software/postgres/software.cfg
+1
-1
stack/lapp/buildout.cfg
stack/lapp/buildout.cfg
+1
-1
stack/lapp/postgres/instance-postgres.cfg.in
stack/lapp/postgres/instance-postgres.cfg.in
+9
-9
No files found.
slapos/recipe/postgres/__init__.py
View file @
9e03b171
...
@@ -40,7 +40,7 @@ class Recipe(GenericBaseRecipe):
...
@@ -40,7 +40,7 @@ class Recipe(GenericBaseRecipe):
This recipe creates:
This recipe creates:
- a Postgres cluster
- a Postgres cluster
- configuration to allow connections from IP
V6 only (or unix socket)
- configuration to allow connections from IP
v4, IPv6 or unix socket.
- a superuser with provided name and generated password
- a superuser with provided name and generated password
- a database with provided name
- a database with provided name
- a foreground start script in the services directory
- a foreground start script in the services directory
...
@@ -49,22 +49,9 @@ class Recipe(GenericBaseRecipe):
...
@@ -49,22 +49,9 @@ class Recipe(GenericBaseRecipe):
The URL can be used as-is (ie. in sqlalchemy) or by the _urlparse.py recipe.
The URL can be used as-is (ie. in sqlalchemy) or by the _urlparse.py recipe.
"""
"""
def
fetch_ipv6_host
(
self
,
options
):
"""
\
Returns a string represtation of ipv6_host.
May receive a regular string, a set or a string serialized by buildout.
"""
ipv6_host
=
options
[
'ipv6_host'
]
if
isinstance
(
ipv6_host
,
set
):
return
ipv6_host
.
pop
()
else
:
return
ipv6_host
def
_options
(
self
,
options
):
def
_options
(
self
,
options
):
options
[
'password'
]
=
self
.
generatePassword
()
options
[
'password'
]
=
self
.
generatePassword
()
options
[
'url'
]
=
'postgresql://%(user)s:%(password)s@[%(ipv
4_host
)s]:%(port)s/%(dbname)s'
%
options
options
[
'url'
]
=
'postgresql://%(user)s:%(password)s@[%(ipv
6_random
)s]:%(port)s/%(dbname)s'
%
options
def
install
(
self
):
def
install
(
self
):
...
@@ -117,10 +104,12 @@ class Recipe(GenericBaseRecipe):
...
@@ -117,10 +104,12 @@ class Recipe(GenericBaseRecipe):
def
createConfig
(
self
):
def
createConfig
(
self
):
pgdata
=
self
.
options
[
'pgdata-directory'
]
pgdata
=
self
.
options
[
'pgdata-directory'
]
ipv4
=
self
.
options
[
'ipv4'
]
ipv6
=
self
.
options
[
'ipv6'
]
with
open
(
os
.
path
.
join
(
pgdata
,
'postgresql.conf'
),
'wb'
)
as
cfg
:
with
open
(
os
.
path
.
join
(
pgdata
,
'postgresql.conf'
),
'wb'
)
as
cfg
:
cfg
.
write
(
textwrap
.
dedent
(
"""
\
cfg
.
write
(
textwrap
.
dedent
(
"""
\
listen_addresses = '%s
,%s
'
listen_addresses = '%s'
logging_collector = on
logging_collector = on
log_rotation_size = 50MB
log_rotation_size = 50MB
max_connections = 100
max_connections = 100
...
@@ -135,25 +124,29 @@ class Recipe(GenericBaseRecipe):
...
@@ -135,25 +124,29 @@ class Recipe(GenericBaseRecipe):
unix_socket_directory = '%s'
unix_socket_directory = '%s'
unix_socket_permissions = 0700
unix_socket_permissions = 0700
"""
%
(
"""
%
(
self
.
options
[
'ipv4_host'
],
','
.
join
(
ipv4
.
union
(
ipv6
)),
self
.
fetch_ipv6_host
(
self
.
options
),
pgdata
,
pgdata
,
)))
)))
with
open
(
os
.
path
.
join
(
pgdata
,
'pg_hba.conf'
),
'wb'
)
as
cfg
:
with
open
(
os
.
path
.
join
(
pgdata
,
'pg_hba.conf'
),
'wb'
)
as
cfg
:
# see http://www.postgresql.org/docs/9.1/static/auth-pg-hba-conf.html
# see http://www.postgresql.org/docs/9.1/static/auth-pg-hba-conf.html
cfg
.
write
(
textwrap
.
dedent
(
"""
\
cfg_lines
=
[
# TYPE DATABASE USER ADDRESS METHOD
'# TYPE DATABASE USER ADDRESS METHOD'
,
''
,
# "local" is for Unix domain socket connections only (check unix_socket_permissions!)
'# "local" is for Unix domain socket connections only (check unix_socket_permissions!)'
,
local all all ident
'local all all ident'
,
host all all 127.0.0.1/32 md5
'host all all 127.0.0.1/32 md5'
,
host all all %s/32 md5
'host all all ::1/128 md5'
,
host all all ::1/128 md5
]
host all all %s/128 md5
"""
%
(
self
.
options
[
'ipv4_host'
],
self
.
fetch_ipv6_host
(
self
.
options
))))
for
ip
in
ipv4
:
cfg_lines
.
append
(
'host all all %s/32 md5'
%
ip
)
for
ip
in
ipv6
:
cfg_lines
.
append
(
'host all all %s/128 md5'
%
ip
)
cfg
.
write
(
'
\
n
'
.
join
(
cfg_lines
))
def
createDatabase
(
self
):
def
createDatabase
(
self
):
...
...
software/postgres/instance.cfg.in
View file @
9e03b171
...
@@ -42,15 +42,16 @@ symlink_base = ${postgresql:location}/bin
...
@@ -42,15 +42,16 @@ symlink_base = ${postgresql:location}/bin
recipe = slapos.cookbook:postgres
recipe = slapos.cookbook:postgres
# Options
# Options
ipv6_host = $${instance-parameters:ipv6}
ipv6 = $${instance-parameters:ipv6}
ipv4_host = $${slap-network-information:local-ipv4}
ipv4 = $${instance-parameters:ipv4}
ipv6_random = $${instance-parameters:ipv6_random}
user = user
user = user
port = 5432
port = 5432
dbname = db
dbname = db
# pgdata_directory is created by initdb, and should not exist beforehand.
# pgdata_directory is created by initdb, and should not exist beforehand.
pgdata-directory = $${directories:var}/data
pgdata-directory = $${directories:var}/data
services = $${directories:services}
bin = $${directories:bin}
bin = $${directories:bin}
services = $${directories:services}
[publish]
[publish]
...
...
software/postgres/software.cfg
View file @
9e03b171
...
@@ -14,7 +14,7 @@ parts =
...
@@ -14,7 +14,7 @@ parts =
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
#md5sum =
md5sum = 5ccffbfc2f1d06fd3ef199bc8b643db7
mode = 0644
mode = 0644
...
...
stack/lapp/buildout.cfg
View file @
9e03b171
...
@@ -86,7 +86,7 @@ mode = 0644
...
@@ -86,7 +86,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/postgres/instance-postgres.cfg.in
url = ${:_profile_base_location_}/postgres/instance-postgres.cfg.in
output = ${buildout:directory}/instance-postgres.cfg
output = ${buildout:directory}/instance-postgres.cfg
md5sum =
9644856614d8f595d0666d76093e1031
md5sum =
4a339ed20f7579e5558fc53637e441fd
mode = 0644
mode = 0644
[instance-postgres-import]
[instance-postgres-import]
...
...
stack/lapp/postgres/instance-postgres.cfg.in
View file @
9e03b171
...
@@ -134,9 +134,9 @@ config-file = $${directory:stunnel-conf}/stunnel.conf
...
@@ -134,9 +134,9 @@ config-file = $${directory:stunnel-conf}/stunnel.conf
key-file = $${directory:stunnel-conf}/stunnel.key
key-file = $${directory:stunnel-conf}/stunnel.key
cert-file = $${directory:stunnel-conf}/stunnel.crt
cert-file = $${directory:stunnel-conf}/stunnel.crt
pid-file = $${basedirectory:run}/stunnel.pid
pid-file = $${basedirectory:run}/stunnel.pid
local-host = $${
postgres-instance:ipv4_host
}
local-host = $${
instance-parameters:ipv4_random
}
local-port = $${postgres-instance:port}
local-port = $${postgres-instance:port}
remote-host = $${
slap-network-information:global-ipv6
}
remote-host = $${
instance-parameters:ipv6_random
}
remote-port = 6446
remote-port = 6446
client = false
client = false
post-rotate-script = $${rootdirectory:bin}/stunnel_post_rotate
post-rotate-script = $${rootdirectory:bin}/stunnel_post_rotate
...
@@ -171,17 +171,17 @@ crl = $${directory:ca-dir}/crl/
...
@@ -171,17 +171,17 @@ crl = $${directory:ca-dir}/crl/
[postgres-instance]
[postgres-instance]
recipe = slapos.cookbook:postgres
recipe = slapos.cookbook:postgres
bin = $${rootdirectory:bin}
ipv6 = $${instance-parameters:ipv6}
services = $${basedirectory:services}
ipv4 = $${instance-parameters:ipv4}
ipv6_random = $${instance-parameters:ipv6_random}
user = postgres
user = postgres
port = 5432
port = 5432
dbname = db
dbname = db
ipv6_host = $${slap-network-information:global-ipv6}
# XXX the next line is required by stunnel, not by us
ipv4_host = $${slap-network-information:local-ipv4}
# pgdata_directory is created by initdb, and should not exist beforehand.
# pgdata_directory is created by initdb, and should not exist beforehand.
pgdata-directory = $${rootdirectory:var}/data
pgdata-directory = $${rootdirectory:var}/data
backup-directory = $${basedirectory:backup}/postgres
backup-directory = $${basedirectory:backup}/postgres
bin = $${rootdirectory:bin}
services = $${basedirectory:services}
dependency-symlinks = $${symlinks:recipe}
dependency-symlinks = $${symlinks:recipe}
[ca-stunnel]
[ca-stunnel]
...
@@ -227,7 +227,7 @@ path = $${directory:report}/slapmonitor-xml
...
@@ -227,7 +227,7 @@ path = $${directory:report}/slapmonitor-xml
[postgres-promise]
[postgres-promise]
recipe = slapos.cookbook:check_port_listening
recipe = slapos.cookbook:check_port_listening
path = $${basedirectory:promises}/postgres
path = $${basedirectory:promises}/postgres
hostname = $${
slap-network-information:global-ipv6
}
hostname = $${
instance-parameters:ipv6_random
}
port = $${postgres-instance:port}
port = $${postgres-instance:port}
...
@@ -238,7 +238,7 @@ port = $${postgres-instance:port}
...
@@ -238,7 +238,7 @@ port = $${postgres-instance:port}
[urls]
[urls]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
url = $${postgres-instance:url}
url = $${postgres-instance:url}
ip = $${
slap-network-information:global-ipv6
}
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