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
Matevz Golob
slapos
Commits
9c64eb18
Commit
9c64eb18
authored
Jun 23, 2016
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup: Remove slapmonitor & slapreport legacy recipes.
parent
942bac49
Changes
20
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
12 additions
and
253 deletions
+12
-253
setup.py
setup.py
+0
-3
slapos/recipe/slapmonitor/__init__.py
slapos/recipe/slapmonitor/__init__.py
+0
-54
slapos/recipe/slapreport/__init__.py
slapos/recipe/slapreport/__init__.py
+0
-46
software/ajaxplorer/instance-apachephp.cfg
software/ajaxplorer/instance-apachephp.cfg
+0
-18
software/ajaxplorer/software.cfg
software/ajaxplorer/software.cfg
+1
-1
software/bonjourgrid/instance-bonjourgrid.cfg
software/bonjourgrid/instance-bonjourgrid.cfg
+0
-1
software/bonjourgrid/software.cfg
software/bonjourgrid/software.cfg
+1
-1
software/unstable/trac-svn/instance-mariadb.cfg
software/unstable/trac-svn/instance-mariadb.cfg
+1
-24
software/unstable/trac-svn/software.cfg
software/unstable/trac-svn/software.cfg
+1
-1
software/unstable/zimbra-kvm/common.cfg
software/unstable/zimbra-kvm/common.cfg
+1
-1
software/unstable/zimbra-kvm/instance-kvm.cfg.in
software/unstable/zimbra-kvm/instance-kvm.cfg.in
+0
-5
stack/boinc/buildout.cfg
stack/boinc/buildout.cfg
+1
-1
stack/boinc/instance-boinc.cfg
stack/boinc/instance-boinc.cfg
+0
-11
stack/lamp/apache/instance-apache-php.cfg.in
stack/lamp/apache/instance-apache-php.cfg.in
+0
-18
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+3
-3
stack/lamp/mariadb/instance-mariadb-export.cfg.in
stack/lamp/mariadb/instance-mariadb-export.cfg.in
+1
-3
stack/lamp/mariadb/instance-mariadb.cfg.in
stack/lamp/mariadb/instance-mariadb.cfg.in
+0
-20
stack/lapp/apache/instance-apache-php.cfg.in
stack/lapp/apache/instance-apache-php.cfg.in
+0
-20
stack/lapp/buildout.cfg
stack/lapp/buildout.cfg
+2
-2
stack/lapp/postgres/instance-postgres.cfg.in
stack/lapp/postgres/instance-postgres.cfg.in
+0
-20
No files found.
setup.py
View file @
9c64eb18
...
...
@@ -182,9 +182,6 @@ setup(name=name,
'slapconfiguration.serialised = slapos.recipe.slapconfiguration:Serialised'
,
'slapconfiguration.jsondump = slapos.recipe.slapconfiguration:JsonDump'
,
'slapcontainer = slapos.recipe.container:Recipe'
,
'slapmonitor = slapos.recipe.slapmonitor:MonitorRecipe'
,
'slapmonitor-xml = slapos.recipe.slapmonitor:MonitorXMLRecipe'
,
'slapreport = slapos.recipe.slapreport:Recipe'
,
'softwaretype = slapos.recipe.softwaretype:Recipe'
,
# BBB
'sphinx= slapos.recipe.sphinx:Recipe'
,
'squid = slapos.recipe.squid:Recipe'
,
...
...
slapos/recipe/slapmonitor/__init__.py
deleted
100644 → 0
View file @
942bac49
##############################################################################
#
# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsibility of assessing all potential
# consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial
# guarantees and support are strongly adviced to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 3
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
from
slapos.recipe.librecipe
import
GenericBaseRecipe
class
MonitorRecipe
(
GenericBaseRecipe
):
def
install
(
self
):
options
=
self
.
options
script
=
self
.
createWrapper
(
name
=
options
[
'path'
],
command
=
options
[
'slapmonitor-path'
],
parameters
=
[
options
[
'pid-file'
],
options
[
'database-path'
],
])
return
[
script
]
class
MonitorXMLRecipe
(
GenericBaseRecipe
):
def
install
(
self
):
options
=
self
.
options
script
=
self
.
createWrapper
(
name
=
options
[
'path'
],
command
=
options
[
'slapmonitor-xml-path'
],
parameters
=
[
options
[
'database-path'
],
],
parameters_extra
=
True
)
return
[
script
]
slapos/recipe/slapreport/__init__.py
deleted
100644 → 0
View file @
942bac49
##############################################################################
#
# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsibility of assessing all potential
# consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial
# guarantees and support are strongly adviced to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 3
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
from
slapos.recipe.librecipe
import
GenericBaseRecipe
class
Recipe
(
GenericBaseRecipe
):
def
install
(
self
):
options
=
self
.
options
script
=
self
.
createWrapper
(
name
=
options
[
'path'
],
command
=
options
[
'slapreport-path'
],
parameters
=
[
options
[
'pid-file'
],
options
[
'consumption-log-path'
],
options
[
'database-path'
],
options
[
'logbox-ip'
],
options
[
'logbox-port'
],
options
[
'logbox-user'
],
options
[
'logbox-passwd'
],
])
return
[
script
]
software/ajaxplorer/instance-apachephp.cfg
View file @
9c64eb18
...
...
@@ -286,24 +286,6 @@ return = site_url
config-custom_domain = $${slap-parameter:domain3}
#----------------
#--
#-- Deploy slapmonitor.
#[slapmonitor]
#recipe = slapos.cookbook:slapmonitor
#pid-file = $${basedirectory:run}/apache.pid
#database-path = $${basedirectory:log}/slapmonitor.db
#slapmonitor-path = ${buildout:bin-directory}/slapmonitor
#path = $${basedirectory:services}/slapmonitor
#
#[slapmonitor-xml]
#recipe = slapos.cookbook:slapmonitor-xml
#database-path = $${basedirectory:log}/slapmonitor.db
#slapmonitor-xml-path = ${buildout:bin-directory}/slapmonitor-xml
#path = $${directory:report}/slapmonitor-xml
#----------------
#--
#-- Publish instance parameters.
...
...
software/ajaxplorer/software.cfg
View file @
9c64eb18
...
...
@@ -35,7 +35,7 @@ md5sum = 4c7936accb3658871b635158198b7905
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-apachephp.cfg
output = ${buildout:directory}/template-apachephp.cfg
md5sum =
8be713bd2656e184651c8ec10579d668
md5sum =
a1ddbb63ffa0041b27eaea6df85cbd00
mode = 0644
[instance-mariadb]
...
...
software/bonjourgrid/instance-bonjourgrid.cfg
View file @
9c64eb18
...
...
@@ -13,7 +13,6 @@ parts =
cron-entry-logrotate
cron-entry-boinc
promise
slapmonitor
frontend-promise
content-promise
publish-connection-informations
...
...
software/bonjourgrid/software.cfg
View file @
9c64eb18
...
...
@@ -46,7 +46,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-bonjourgrid.cfg
output = ${buildout:directory}/template-bonjourgrid.cfg
mode = 0644
md5sum =
59cc789d6ce765d3d25f9bd6f9659e55
md5sum =
877878217bd87e3b3e4f69d7bdbb5524
[bonjourgrid]
recipe = hexagonit.recipe.download
...
...
software/unstable/trac-svn/instance-mariadb.cfg
View file @
9c64eb18
...
...
@@ -11,8 +11,6 @@ parts =
logrotate-entry-cron
cron
cron-entry-logrotate
slapmonitor
slapreport
gzip-binary = ${gzip:location}/bin/gzip
...
...
@@ -85,27 +83,6 @@ recipe = slapos.cookbook:generate.password
storage-path = $${rootdirectory:etc}/.passwd
bytes = 4
[slapmonitor]
recipe = slapos.cookbook:slapmonitor
pid-file = $${basedirectory:run}/mariadb.pid
database-path = $${basedirectory:log}/slapmonitor.db
shell-path = ${dash:location}/bin/dash
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
path = $${basedirectory:scripts}/slapmonitor
[slapreport]
recipe = slapos.cookbook:slapreport
pid-file = $${basedirectory:run}/mariadb.pid
consumption-log-path = $${basedirectory:log}/instance_consumption.log
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
slapreport-path = ${buildout:bin-directory}/slapreport
path = $${basedirectory:scripts}/slapreport
[certificate-authority]
recipe = slapos.cookbook:certificate_authority
openssl-binary = ${openssl:location}/bin/openssl
...
...
software/unstable/trac-svn/software.cfg
View file @
9c64eb18
...
...
@@ -91,7 +91,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-mariadb.cfg
output = ${buildout:directory}/template-mariadb.cfg
md5sum =
4ea69039e41ff45bffe8f2620bdf187c
md5sum =
3b3f85a2554902a2b8b4b691407fbfbd
mode = 0644
[template-download]
...
...
software/unstable/zimbra-kvm/common.cfg
View file @
9c64eb18
...
...
@@ -27,7 +27,7 @@ eggs =
[template-kvm]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-kvm.cfg.in
#md5sum =
d4f7203365bacd70ad62f6b6de9f74d4
#md5sum =
f36565408d3ed82d165727a7ba66bf4f
output = ${buildout:directory}/template-kvm.cfg
mode = 0644
...
...
software/unstable/zimbra-kvm/instance-kvm.cfg.in
View file @
9c64eb18
...
...
@@ -180,11 +180,6 @@ hostname = $${novnc-instance:ip}
port = $${novnc-instance:port}
[kvm-monitor]
recipe = slapos.cookbook:generic.slapmonitor
db-path = $${directory:srv}/slapmonitor_database
[request-slave-frontend]
recipe = slapos.cookbook:requestoptional
software-url = $${slap-parameter:frontend-software-url}
...
...
stack/boinc/buildout.cfg
View file @
9c64eb18
...
...
@@ -34,7 +34,7 @@ eggs =
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-boinc.cfg
output = ${buildout:directory}/template-boinc.cfg
md5sum =
5eb6057311fb1f73a54b72a40ead47c2
md5sum =
35c1ecb06d81d6d491e17423f5743985
mode = 0644
#Template for deploying MySQL Database Server
...
...
stack/boinc/instance-boinc.cfg
View file @
9c64eb18
...
...
@@ -12,7 +12,6 @@ parts =
cron-entry-logrotate
cron-entry-boinc
promise
slapmonitor
frontend-promise
content-promise
publish-connection-informations
...
...
@@ -307,16 +306,6 @@ return = site_url
config-custom_domain = $${slap-parameter:domain}
# Deploy slapmonitor
[slapmonitor]
recipe = slapos.cookbook:slapmonitor
pid-file = $${basedirectory:run}/apache.pid
database-path = $${basedirectory:log}/slapmonitor.db
shell-path = ${dash:location}/bin/dash
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
path = $${basedirectory:scripts}/slapmonitor
# Publish all instance parameters (url of instance)
[publish-connection-informations]
recipe = slapos.cookbook:publish
...
...
stack/lamp/apache/instance-apache-php.cfg.in
View file @
9c64eb18
...
...
@@ -254,24 +254,6 @@ return = site_url
config-custom_domain = $${slap-parameter:domain}
#----------------
#--
#-- Deploy slapmonitor.
#[slapmonitor]
#recipe = slapos.cookbook:slapmonitor
#pid-file = $${basedirectory:run}/apache.pid
#database-path = $${basedirectory:log}/slapmonitor.db
#slapmonitor-path = ${buildout:bin-directory}/slapmonitor
#path = $${basedirectory:services}/slapmonitor
#
#[slapmonitor-xml]
#recipe = slapos.cookbook:slapmonitor-xml
#database-path = $${basedirectory:log}/slapmonitor.db
#slapmonitor-xml-path = ${buildout:bin-directory}/slapmonitor-xml
#path = $${directory:report}/slapmonitor-xml
#----------------
#--
#-- Publish instance parameters.
...
...
stack/lamp/buildout.cfg
View file @
9c64eb18
...
...
@@ -75,7 +75,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
output = ${buildout:directory}/instance-apache-php.cfg
md5sum =
963ec2e460b281405b9e0e2748a27e62
md5sum =
5800e365e200240e33defea9561c0b23
mode = 0644
[instance-apache-import]
...
...
@@ -120,7 +120,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/mariadb/instance-mariadb.cfg.in
output = ${buildout:directory}/instance-mariadb.cfg
md5sum =
c328d11f76373f8c5928afedf2178afd
md5sum =
1d3022164dd70efe374a179ef319e0eb
mode = 0644
[instance-mariadb-import]
...
...
@@ -134,7 +134,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/mariadb/instance-mariadb-export.cfg.in
output = ${buildout:directory}/instance-mariadb-export.cfg
md5sum =
0352896921ca1766b64f0b54f0f8c27e
md5sum =
d17228a2708cbb39dc00945a93e0740d
mode = 0644
...
...
stack/lamp/mariadb/instance-mariadb-export.cfg.in
View file @
9c64eb18
...
...
@@ -15,8 +15,6 @@ parts +=
logrotate-entry-cron
cron
cron-entry-logrotate
slapmonitor
slapmonitor-xml
# Define exporter strategy
[exporter]
...
...
stack/lamp/mariadb/instance-mariadb.cfg.in
View file @
9c64eb18
...
...
@@ -11,8 +11,6 @@ parts =
logrotate-entry-cron
cron
cron-entry-logrotate
slapmonitor
slapmonitor-xml
# Define egg directories to be the one from Software Release
# (/opt/slapgrid/...)
...
...
@@ -223,24 +221,6 @@ storage-path = $${rootdirectory:etc}/.passwd
bytes = 4
#----------------
#--
#-- Deploy slapmonitor.
[slapmonitor]
recipe = slapos.cookbook:slapmonitor
pid-file = $${basedirectory:run}/mariadb.pid
database-path = $${basedirectory:log}/slapmonitor.db
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
path = $${basedirectory:services}/slapmonitor
[slapmonitor-xml]
recipe = slapos.cookbook:slapmonitor-xml
database-path = $${basedirectory:log}/slapmonitor.db
slapmonitor-xml-path = ${buildout:bin-directory}/slapmonitor-xml
path = $${directory:report}/slapmonitor-xml
#----------------
#--
#-- Publish instance parameters.
...
...
stack/lapp/apache/instance-apache-php.cfg.in
View file @
9c64eb18
...
...
@@ -10,8 +10,6 @@ parts =
cron
cron-entry-logrotate
promise
slapmonitor
slapmonitor-xml
frontend-promise
content-promise
...
...
@@ -239,24 +237,6 @@ return = site_url
config-custom_domain = $${slap-parameter:domain}
#----------------
#--
#-- Deploy slapmonitor.
[slapmonitor]
recipe = slapos.cookbook:slapmonitor
pid-file = $${basedirectory:run}/apache.pid
database-path = $${basedirectory:log}/slapmonitor.db
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
path = $${basedirectory:services}/slapmonitor
[slapmonitor-xml]
recipe = slapos.cookbook:slapmonitor-xml
database-path = $${basedirectory:log}/slapmonitor.db
slapmonitor-xml-path = ${buildout:bin-directory}/slapmonitor-xml
path = $${directory:report}/slapmonitor-xml
#----------------
#--
#-- Publish instance parameters.
...
...
stack/lapp/buildout.cfg
View file @
9c64eb18
...
...
@@ -63,7 +63,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
output = ${buildout:directory}/instance-apache-php.cfg
md5sum =
8b9e7ac376cad5235e88a45ece817e6b
md5sum =
f0f8ee964a43375000f1875e62140065
mode = 0644
[instance-apache-import]
...
...
@@ -108,7 +108,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/postgres/instance-postgres.cfg.in
output = ${buildout:directory}/instance-postgres.cfg
md5sum =
a2370d9a23e436166b20203f66412608
md5sum =
478970c13c1bb607d72e1f970555fe1d
mode = 0644
[instance-postgres-import]
...
...
stack/lapp/postgres/instance-postgres.cfg.in
View file @
9c64eb18
...
...
@@ -11,8 +11,6 @@ parts =
logrotate-entry-cron
cron
cron-entry-logrotate
slapmonitor
slapmonitor-xml
gzip-binary = ${gzip:location}/bin/gzip
...
...
@@ -208,24 +206,6 @@ storage-path = $${rootdirectory:srv}/postgres_passwd
bytes = 16
#----------------
#--
#-- Deploy slapmonitor.
[slapmonitor]
recipe = slapos.cookbook:slapmonitor
pid-file = $${postgres-instance:pgdata-directory}/postmaster.pid
database-path = $${basedirectory:log}/slapmonitor.db
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
path = $${basedirectory:services}/slapmonitor
[slapmonitor-xml]
recipe = slapos.cookbook:slapmonitor-xml
database-path = $${basedirectory:log}/slapmonitor.db
slapmonitor-xml-path = ${buildout:bin-directory}/slapmonitor-xml
path = $${directory:report}/slapmonitor-xml
#----------------
#--
#-- Deploy promise scripts.
...
...
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