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
Vincent Bechu
slapos
Commits
cae1e12e
Commit
cae1e12e
authored
Jun 03, 2012
by
Mohamadou Mbengue
Committed by
Cédric de Saint Martin
Jun 18, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename parameters and reorganise instance_*.cfg
parent
ed3f57c4
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
33 additions
and
27 deletions
+33
-27
setup.py
setup.py
+2
-2
slapos/recipe/slapmonitor/__init__.py
slapos/recipe/slapmonitor/__init__.py
+0
-4
slapos/recipe/slapreport/__init__.py
slapos/recipe/slapreport/__init__.py
+5
-9
slapos/recipe/slapreport/template/slapreport_run.in
slapos/recipe/slapreport/template/slapreport_run.in
+1
-1
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+2
-2
stack/lamp/instance-apache-php.cfg
stack/lamp/instance-apache-php.cfg
+12
-5
stack/lamp/instance-mariadb.cfg
stack/lamp/instance-mariadb.cfg
+11
-4
No files found.
setup.py
View file @
cae1e12e
slapos/recipe/slapmonitor/__init__.py
View file @
cae1e12e
...
@@ -25,9 +25,6 @@
...
@@ -25,9 +25,6 @@
#
#
##############################################################################
##############################################################################
from
slapos.recipe.librecipe
import
GenericBaseRecipe
from
slapos.recipe.librecipe
import
GenericBaseRecipe
import
binascii
import
os
import
sys
class
Recipe
(
GenericBaseRecipe
):
class
Recipe
(
GenericBaseRecipe
):
"""
"""
...
@@ -35,7 +32,6 @@ class Recipe(GenericBaseRecipe):
...
@@ -35,7 +32,6 @@ class Recipe(GenericBaseRecipe):
"""
"""
def
__init__
(
self
,
buildout
,
name
,
options
):
def
__init__
(
self
,
buildout
,
name
,
options
):
#options['key'] = binascii.hexlify(os.urandom(24))
return
GenericBaseRecipe
.
__init__
(
self
,
buildout
,
name
,
options
)
return
GenericBaseRecipe
.
__init__
(
self
,
buildout
,
name
,
options
)
def
install
(
self
):
def
install
(
self
):
...
...
slapos/recipe/slapreport/__init__.py
View file @
cae1e12e
...
@@ -25,9 +25,6 @@
...
@@ -25,9 +25,6 @@
#
#
##############################################################################
##############################################################################
from
slapos.recipe.librecipe
import
GenericBaseRecipe
from
slapos.recipe.librecipe
import
GenericBaseRecipe
import
binascii
import
os
import
sys
class
Recipe
(
GenericBaseRecipe
):
class
Recipe
(
GenericBaseRecipe
):
"""
"""
...
@@ -35,19 +32,18 @@ class Recipe(GenericBaseRecipe):
...
@@ -35,19 +32,18 @@ class Recipe(GenericBaseRecipe):
"""
"""
def
__init__
(
self
,
buildout
,
name
,
options
):
def
__init__
(
self
,
buildout
,
name
,
options
):
#options['key'] = binascii.hexlify(os.urandom(24))
return
GenericBaseRecipe
.
__init__
(
self
,
buildout
,
name
,
options
)
return
GenericBaseRecipe
.
__init__
(
self
,
buildout
,
name
,
options
)
def
install
(
self
):
def
install
(
self
):
config
=
dict
(
config
=
dict
(
pid_file_path
=
self
.
options
[
'pid-file'
],
pid_file_path
=
self
.
options
[
'pid-file'
],
consumption_log_
file
=
self
.
options
[
'consumption-log-path'
],
consumption_log_
path
=
self
.
options
[
'consumption-log-path'
],
database_path
=
self
.
options
[
'database-path'
],
database_path
=
self
.
options
[
'database-path'
],
slapreport_path
=
self
.
options
[
'slapreport-path'
],
slapreport_path
=
self
.
options
[
'slapreport-path'
],
logbox_ip
=
self
.
options
[
'log
-server
-ip'
],
logbox_ip
=
self
.
options
[
'log
box
-ip'
],
logbox_port
=
self
.
options
[
'log
-server
-port'
],
logbox_port
=
self
.
options
[
'log
box
-port'
],
logbox_
login
=
self
.
options
[
'log-server-login
'
],
logbox_
user
=
self
.
options
[
'logbox-user
'
],
logbox_passw
ord
=
self
.
options
[
'log-server-passwor
d'
],
logbox_passw
d
=
self
.
options
[
'logbox-passw
d'
],
shell_path
=
self
.
options
[
'shell-path'
],
shell_path
=
self
.
options
[
'shell-path'
],
)
)
...
...
slapos/recipe/slapreport/template/slapreport_run.in
View file @
cae1e12e
...
@@ -2,4 +2,4 @@
...
@@ -2,4 +2,4 @@
# BEWARE: This file is operated by slapgrid
# BEWARE: This file is operated by slapgrid
# BEWARE: It will be overwritten automatically
# BEWARE: It will be overwritten automatically
#
#
exec %(slapreport_path)s %(pid_file_path)s %(consumption_log_
file)s %(database_path)s %(logbox_ip)s %(logbox_port)s %(logbox_login)s %(logbox_passwor
d)s
exec %(slapreport_path)s %(pid_file_path)s %(consumption_log_
path)s %(database_path)s %(logbox_ip)s %(logbox_port)s %(logbox_user)s %(logbox_passw
d)s
stack/lamp/buildout.cfg
View file @
cae1e12e
...
@@ -69,7 +69,7 @@ mode = 0644
...
@@ -69,7 +69,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-apache-php.cfg
url = ${:_profile_base_location_}/instance-apache-php.cfg
output = ${buildout:directory}/template-apache-php.cfg
output = ${buildout:directory}/template-apache-php.cfg
md5sum =
166cc6dc2b5b4e54ad743748a55ad94c
md5sum =
3bdba795df03affe6a62201019b995a4
mode = 0644
mode = 0644
[template-apache-backup]
[template-apache-backup]
...
@@ -90,7 +90,7 @@ mode = 0644
...
@@ -90,7 +90,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-mariadb.cfg
url = ${:_profile_base_location_}/instance-mariadb.cfg
output = ${buildout:directory}/template-mariadb.cfg
output = ${buildout:directory}/template-mariadb.cfg
md5sum =
8a0f5a567726b3e32f4b43b1d9bfc52c
md5sum =
ba5ebecbfe9fbb96d48f2baa43c37065
mode = 0644
mode = 0644
[template-mariadb-pbsready]
[template-mariadb-pbsready]
...
...
stack/lamp/instance-apache-php.cfg
View file @
cae1e12e
...
@@ -71,12 +71,12 @@ path = $${basedirectory:services}/slapmonitor
...
@@ -71,12 +71,12 @@ path = $${basedirectory:services}/slapmonitor
[slapreport]
[slapreport]
recipe = slapos.cookbook:slapreport
recipe = slapos.cookbook:slapreport
pid-file = $${basedirectory:run}/apache.pid
pid-file = $${basedirectory:run}/apache.pid
consumption-log-path = $${basedirectory:log}/instance_consumption.log
log-server-ip = 192.168.1.139
log-server-port = 5122
log-server-login = admin
log-server-password = passer
database-path = $${basedirectory:log}/slapmonitor.db
database-path = $${basedirectory:log}/slapmonitor.db
consumption-log-path = $${basedirectory:log}/instance_consumption.log
logbox-ip = 87.98.152.12
logbox-port = 5122
logbox-user = admin
logbox-passwd = passer
shell-path = ${dash:location}/bin/dash
shell-path = ${dash:location}/bin/dash
slapreport-path = ${buildout:bin-directory}/slapreport
slapreport-path = ${buildout:bin-directory}/slapreport
path = $${basedirectory:services}/slapreport
path = $${basedirectory:services}/slapreport
...
@@ -217,3 +217,10 @@ stunnel-conf = $${rootdirectory:etc}/stunnel/
...
@@ -217,3 +217,10 @@ stunnel-conf = $${rootdirectory:etc}/stunnel/
cronstamps = $${rootdirectory:etc}/cronstamps/
cronstamps = $${rootdirectory:etc}/cronstamps/
cron-entries = $${rootdirectory:etc}/cron.d/
cron-entries = $${rootdirectory:etc}/cron.d/
crontabs = $${rootdirectory:etc}/crontabs/
crontabs = $${rootdirectory:etc}/crontabs/
[slap-parameter]
#Default value if no ssh parameters specified
logbox-ip =
logbox-port =
logbox-user =
logbox-passwd =
stack/lamp/instance-mariadb.cfg
View file @
cae1e12e
...
@@ -63,11 +63,11 @@ path = $${basedirectory:services}/slapmonitor
...
@@ -63,11 +63,11 @@ path = $${basedirectory:services}/slapmonitor
recipe = slapos.cookbook:slapreport
recipe = slapos.cookbook:slapreport
pid-file = $${basedirectory:run}/mariadb.pid
pid-file = $${basedirectory:run}/mariadb.pid
consumption-log-path = $${basedirectory:log}/instance_consumption.log
consumption-log-path = $${basedirectory:log}/instance_consumption.log
log-server-ip = 192.168.1.139
log-server-port = 5122
log-server-login = admin
log-server-password = passer
database-path = $${basedirectory:log}/slapmonitor.db
database-path = $${basedirectory:log}/slapmonitor.db
logbox-ip = 87.98.152.12
logbox-port = 5122
logbox-user = admin
logbox-passwd = passer
shell-path = ${dash:location}/bin/dash
shell-path = ${dash:location}/bin/dash
slapreport-path = ${buildout:bin-directory}/slapreport
slapreport-path = ${buildout:bin-directory}/slapreport
path = $${basedirectory:services}/slapreport
path = $${basedirectory:services}/slapreport
...
@@ -207,3 +207,10 @@ mariadb-data = $${rootdirectory:srv}/mariadb/
...
@@ -207,3 +207,10 @@ mariadb-data = $${rootdirectory:srv}/mariadb/
logrotate-backup = $${basedirectory:backup}/logrotate/
logrotate-backup = $${basedirectory:backup}/logrotate/
stunnel-conf = $${rootdirectory:etc}/stunnel/
stunnel-conf = $${rootdirectory:etc}/stunnel/
logrotate-entries = $${rootdirectory:etc}/logrotate.d/
logrotate-entries = $${rootdirectory:etc}/logrotate.d/
[slap-parameter]
#Default value if no ssh parameters specified
logbox-ip =
logbox-port =
logbox-user =
logbox-passwd =
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