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
Gabriel Monnerat
slapos
Commits
74635fc3
Commit
74635fc3
authored
Jan 10, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more comments; changed superuser name
parent
ba1395af
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
66 additions
and
16 deletions
+66
-16
slapos/recipe/postgres/__init__.py
slapos/recipe/postgres/__init__.py
+62
-12
software/postgres/instance.cfg.in
software/postgres/instance.cfg.in
+1
-1
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
+1
-1
No files found.
slapos/recipe/postgres/__init__.py
View file @
74635fc3
...
@@ -43,15 +43,35 @@ class Recipe(GenericBaseRecipe):
...
@@ -43,15 +43,35 @@ class Recipe(GenericBaseRecipe):
- configuration to allow connections from IPv4, IPv6 or unix socket.
- configuration to allow connections from IPv4, 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 start script in the services directory
then adds the connection URL to the options.
Required options:
The URL can be used as-is (ie. in sqlalchemy) or by the _urlparse.py recipe.
bin
path to the 'initdb' and 'postgres' binaries.
dbname
name of the database to be used by the application.
ipv4
set of ipv4 to listen on.
ipv6
set of ipv6 to listen on.
pgdata-directory
path to postgres configuration and data.
services
must be ${buildout:directory}/etc/service.
superuser
name of the superuser to create.
Exposed options:
password
generated password for the superuser.
url
generated DBAPI connection string.
it can be used as-is (ie. in sqlalchemy) or by the _urlparse.py recipe.
"""
"""
def
_options
(
self
,
options
):
def
_options
(
self
,
options
):
options
[
'password'
]
=
self
.
generatePassword
()
options
[
'password'
]
=
self
.
generatePassword
()
options
[
'url'
]
=
'postgresql://%(user)s:%(password)s@[%(ipv6_random)s]:%(port)s/%(dbname)s'
%
options
options
[
'url'
]
=
'postgresql://%(
super
user)s:%(password)s@[%(ipv6_random)s]:%(port)s/%(dbname)s'
%
options
def
install
(
self
):
def
install
(
self
):
...
@@ -63,7 +83,7 @@ class Recipe(GenericBaseRecipe):
...
@@ -63,7 +83,7 @@ class Recipe(GenericBaseRecipe):
self
.
createCluster
()
self
.
createCluster
()
self
.
createConfig
()
self
.
createConfig
()
self
.
createDatabase
()
self
.
createDatabase
()
self
.
cre
ateSuperuser
()
self
.
upd
ateSuperuser
()
self
.
createRunScript
()
self
.
createRunScript
()
# install() methods usually return the pathnames of managed files.
# install() methods usually return the pathnames of managed files.
...
@@ -96,7 +116,7 @@ class Recipe(GenericBaseRecipe):
...
@@ -96,7 +116,7 @@ class Recipe(GenericBaseRecipe):
'-D'
,
pgdata
,
'-D'
,
pgdata
,
'-A'
,
'ident'
,
'-A'
,
'ident'
,
'-E'
,
'UTF8'
,
'-E'
,
'UTF8'
,
'-U'
,
self
.
options
[
'user'
],
'-U'
,
self
.
options
[
'
super
user'
],
])
])
except
subprocess
.
CalledProcessError
:
except
subprocess
.
CalledProcessError
:
raise
UserError
(
'Could not create cluster directory in %s'
%
pgdata
)
raise
UserError
(
'Could not create cluster directory in %s'
%
pgdata
)
...
@@ -129,7 +149,7 @@ class Recipe(GenericBaseRecipe):
...
@@ -129,7 +149,7 @@ class Recipe(GenericBaseRecipe):
)))
)))
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.
2
/static/auth-pg-hba-conf.html
cfg_lines
=
[
cfg_lines
=
[
'# TYPE DATABASE USER ADDRESS METHOD'
,
'# TYPE DATABASE USER ADDRESS METHOD'
,
...
@@ -153,15 +173,15 @@ class Recipe(GenericBaseRecipe):
...
@@ -153,15 +173,15 @@ class Recipe(GenericBaseRecipe):
self
.
runPostgresCommand
(
cmd
=
'CREATE DATABASE "%s"'
%
self
.
options
[
'dbname'
])
self
.
runPostgresCommand
(
cmd
=
'CREATE DATABASE "%s"'
%
self
.
options
[
'dbname'
])
def
cre
ateSuperuser
(
self
):
def
upd
ateSuperuser
(
self
):
"""
\
"""
\
Set a password for the
Postgres superuse
r.
Set a password for the
cluster administrato
r.
The application will also use
this
for its connections.
The application will also use
it
for its connections.
"""
"""
# http://postgresql.1045698.n5.nabble.com/Algorithm-for-generating-md5-encrypted-password-not-found-in-documentation-td4919082.html
# http://postgresql.1045698.n5.nabble.com/Algorithm-for-generating-md5-encrypted-password-not-found-in-documentation-td4919082.html
user
=
self
.
options
[
'user'
]
user
=
self
.
options
[
'
super
user'
]
password
=
self
.
options
[
'password'
]
password
=
self
.
options
[
'password'
]
# encrypt the password to avoid storing in the logs
# encrypt the password to avoid storing in the logs
...
@@ -210,6 +230,21 @@ class Recipe(GenericBaseRecipe):
...
@@ -210,6 +230,21 @@ class Recipe(GenericBaseRecipe):
class
ExportRecipe
(
GenericBaseRecipe
):
class
ExportRecipe
(
GenericBaseRecipe
):
"""
\
This recipe creates an exporter script for using with the resilient stack.
Required options:
backup-directory
folder that will contain the dump file.
bin
path to the 'pg_dump' binary.
dbname
name of the database to dump.
pgdata-directory
path to postgres configuration and data.
wrapper
full path of the exporter script to create.
"""
def
install
(
self
):
def
install
(
self
):
wrapper
=
self
.
options
[
'wrapper'
]
wrapper
=
self
.
options
[
'wrapper'
]
...
@@ -235,6 +270,21 @@ class ExportRecipe(GenericBaseRecipe):
...
@@ -235,6 +270,21 @@ class ExportRecipe(GenericBaseRecipe):
class
ImportRecipe
(
GenericBaseRecipe
):
class
ImportRecipe
(
GenericBaseRecipe
):
"""
\
This recipe creates an importer script for using with the resilient stack.
Required options:
backup-directory
folder that contains the dump file.
bin
path to the 'pg_restore' binary.
dbname
name of the database to restore.
pgdata-directory
path to postgres configuration and data.
wrapper
full path of the importer script to create.
"""
def
install
(
self
):
def
install
(
self
):
wrapper
=
self
.
options
[
'wrapper'
]
wrapper
=
self
.
options
[
'wrapper'
]
...
...
software/postgres/instance.cfg.in
View file @
74635fc3
...
@@ -33,7 +33,7 @@ recipe = slapos.cookbook:postgres
...
@@ -33,7 +33,7 @@ recipe = slapos.cookbook:postgres
ipv6 = $${instance-parameters:ipv6}
ipv6 = $${instance-parameters:ipv6}
ipv4 = $${instance-parameters:ipv4}
ipv4 = $${instance-parameters:ipv4}
ipv6_random = $${instance-parameters:ipv6_random}
ipv6_random = $${instance-parameters:ipv6_random}
user = postgres
super
user = postgres
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.
...
...
software/postgres/software.cfg
View file @
74635fc3
...
@@ -18,7 +18,7 @@ parts =
...
@@ -18,7 +18,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}/instance.cfg
output = ${buildout:directory}/instance.cfg
md5sum =
b7175c4b086b3d0bfa57a4f132679664
md5sum =
f2f335b7b0d915d38fa76eaacff56158
mode = 0644
mode = 0644
...
...
stack/lapp/buildout.cfg
View file @
74635fc3
...
@@ -87,7 +87,7 @@ mode = 0644
...
@@ -87,7 +87,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 =
df34ba3a6542855dd01908306695af8d
md5sum =
42b92fb4905e2903caca327feddb5141
mode = 0644
mode = 0644
[instance-postgres-import]
[instance-postgres-import]
...
...
stack/lapp/postgres/instance-postgres.cfg.in
View file @
74635fc3
...
@@ -175,7 +175,7 @@ recipe = slapos.cookbook:postgres
...
@@ -175,7 +175,7 @@ recipe = slapos.cookbook:postgres
ipv6 = $${instance-parameters:ipv6}
ipv6 = $${instance-parameters:ipv6}
ipv4 = $${instance-parameters:ipv4}
ipv4 = $${instance-parameters:ipv4}
ipv6_random = $${instance-parameters:ipv6_random}
ipv6_random = $${instance-parameters:ipv6_random}
user = postgres
super
user = postgres
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.
...
...
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