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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ivan Tyagov
slapos
Commits
bd853c9c
Commit
bd853c9c
authored
Sep 24, 2012
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
create db and user in separate steps
parent
7a4ef3b6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
19 deletions
+30
-19
slapos/recipe/postgres/__init__.py
slapos/recipe/postgres/__init__.py
+30
-19
No files found.
slapos/recipe/postgres/__init__.py
View file @
bd853c9c
...
@@ -35,6 +35,7 @@ from zc.buildout import UserError
...
@@ -35,6 +35,7 @@ from zc.buildout import UserError
from
slapos.recipe.librecipe
import
GenericBaseRecipe
from
slapos.recipe.librecipe
import
GenericBaseRecipe
from
slapos.recipe.librecipe
import
filehash
from
slapos.recipe.librecipe
import
filehash
class
Recipe
(
GenericBaseRecipe
):
class
Recipe
(
GenericBaseRecipe
):
def
_options
(
self
,
options
):
def
_options
(
self
,
options
):
...
@@ -49,10 +50,12 @@ class Recipe(GenericBaseRecipe):
...
@@ -49,10 +50,12 @@ class Recipe(GenericBaseRecipe):
self
.
createCluster
()
self
.
createCluster
()
self
.
createConfig
()
self
.
createConfig
()
self
.
createDatabase
()
self
.
createDatabase
()
self
.
createSuperuser
()
self
.
createRunScript
()
self
.
createRunScript
()
return
[
return
[
os
.
path
.
join
(
pgdata
,
'postgresql.conf'
)
# XXX what to return here?
# os.path.join(pgdata, 'postgresql.conf')
]
]
...
@@ -98,19 +101,33 @@ class Recipe(GenericBaseRecipe):
...
@@ -98,19 +101,33 @@ class Recipe(GenericBaseRecipe):
# "local" is for Unix domain socket connections only
# "local" is for Unix domain socket connections only
local all all ident
local all all ident
# IPv4 local connections:
host all all 127.0.0.1/32 md5
host all all 127.0.0.1/32 md5
# IPv6 local connections:
host all all ::1/128 md5
host all all ::1/128 md5
# Allow replication connections from localhost, by a user with the
# replication privilege.
#local replication slapuser4 ident
#host replication slapuser4 127.0.0.1/32 md5
#host replication slapuser4 ::1/128 md5
"""
))
"""
))
def
createDatabase
(
self
):
def
createDatabase
(
self
):
self
.
runPostgresCommand
(
cmd
=
'CREATE DATABASE "%s"'
%
self
.
options
[
'dbname'
])
def
createSuperuser
(
self
):
"""
Creates a Postgres superuser - other than "slapuser#" for use by the application.
"""
password
=
'insecure'
enc_password
=
md5
.
md5
(
password
).
hexdigest
()
self
.
runPostgresCommand
(
cmd
=
"""CREATE USER "%s" PASSWORD '%s' SUPERUSER"""
%
(
self
.
options
[
'user'
],
enc_password
))
def
runPostgresCommand
(
self
,
cmd
):
"""
Executes a command in single-user mode, with no daemon running.
Multiple commands can be executed by providing newlines,
preceeded by backslash, between them.
See http://www.postgresql.org/docs/9.1/static/app-postgres.html
"""
pgdata
=
self
.
options
[
'pgdata-directory'
]
pgdata
=
self
.
options
[
'pgdata-directory'
]
postgres_binary
=
os
.
path
.
join
(
self
.
options
[
'bin'
],
'postgres'
)
postgres_binary
=
os
.
path
.
join
(
self
.
options
[
'bin'
],
'postgres'
)
...
@@ -120,23 +137,17 @@ class Recipe(GenericBaseRecipe):
...
@@ -120,23 +137,17 @@ class Recipe(GenericBaseRecipe):
'-D'
,
pgdata
,
'-D'
,
pgdata
,
'postgres'
,
'postgres'
,
],
stdin
=
subprocess
.
PIPE
)
],
stdin
=
subprocess
.
PIPE
)
password
=
'insecure'
enc_password
=
md5
.
md5
(
password
).
hexdigest
()
# to execute multiple commands, all newlines (but the last) must be preceded by backslash.
# see http://www.postgresql.org/docs/9.1/static/app-postgres.html
sql
=
'
\
n
'
.
join
([
p
.
communicate
(
cmd
+
'
\
n
'
)
'CREATE DATABASE %s
\
\
\
n
'
%
self
.
options
[
'dbname'
],
"CREATE USER '%s' PASSWORD '%s' SUPERUSER'
\
n
"
%
(
self
.
options
[
'user'
],
enc_password
),
])
p
.
communicate
(
sql
)
except
subprocess
.
CalledProcessError
:
except
subprocess
.
CalledProcessError
:
raise
UserError
(
'Could not create database %s'
%
pgdata
)
raise
UserError
(
'Could not create database %s'
%
pgdata
)
def
createRunScript
(
self
):
def
createRunScript
(
self
):
# 'exec' the command to control it from supervisor
"""
Creates a script that runs postgres in the foreground.
'exec' is used to allow easy control by supervisor.
"""
content
=
textwrap
.
dedent
(
"""
\
content
=
textwrap
.
dedent
(
"""
\
#!/bin/sh
#!/bin/sh
exec %(bin)s/postgres
\
\
exec %(bin)s/postgres
\
\
...
...
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