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
7845378e
Commit
7845378e
authored
Dec 03, 2012
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use slapmonitor-xml in place of slapreport
parent
d637e02d
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
47 additions
and
68 deletions
+47
-68
stack/lamp/apache/instance-apache-php.cfg.in
stack/lamp/apache/instance-apache-php.cfg.in
+12
-17
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+3
-3
stack/lamp/mariadb/instance-mariadb.cfg.in
stack/lamp/mariadb/instance-mariadb.cfg.in
+8
-14
stack/lamp/template-resilient.cfg.in
stack/lamp/template-resilient.cfg.in
+2
-1
stack/lapp/apache/instance-apache-php.cfg.in
stack/lapp/apache/instance-apache-php.cfg.in
+11
-16
stack/lapp/buildout.cfg
stack/lapp/buildout.cfg
+3
-3
stack/lapp/postgres/instance-postgres.cfg.in
stack/lapp/postgres/instance-postgres.cfg.in
+7
-13
stack/lapp/template-resilient.cfg.in
stack/lapp/template-resilient.cfg.in
+1
-1
No files found.
stack/lamp/apache/instance-apache-php.cfg.in
View file @
7845378e
...
@@ -10,7 +10,8 @@ parts =
...
@@ -10,7 +10,8 @@ parts =
cron-entry-logrotate
cron-entry-logrotate
promise
promise
slapmonitor
slapmonitor
slapreport
slapmonitor-xml
frontend-promise
frontend-promise
content-promise
content-promise
publish-connection-informations
publish-connection-informations
...
@@ -42,16 +43,18 @@ promises = $${rootdirectory:etc}/promise
...
@@ -42,16 +43,18 @@ promises = $${rootdirectory:etc}/promise
[directory]
[directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
cron-entries = $${rootdirectory:etc}/cron.d
crontabs = $${rootdirectory:etc}/crontabs
cronstamps = $${rootdirectory:etc}/cronstamps
ca-dir = $${rootdirectory:srv}/ssl
ca-dir = $${rootdirectory:srv}/ssl
httpd-log = $${basedirectory:log}/apache
httpd-log = $${basedirectory:log}/apache
php-ini-dir = $${rootdirectory:etc}/php
php-ini-dir = $${rootdirectory:etc}/php
tmp-php = $${rootdirectory:tmp}/php
tmp-php = $${rootdirectory:tmp}/php
logrotate-entries = $${rootdirectory:etc}/logrotate.d
logrotate-entries = $${rootdirectory:etc}/logrotate.d
logrotate-backup = $${basedirectory:backup}/logrotate
logrotate-backup = $${basedirectory:backup}/logrotate
report = $${rootdirectory:etc}/report
stunnel-conf = $${rootdirectory:etc}/stunnel
stunnel-conf = $${rootdirectory:etc}/stunnel
cronstamps = $${rootdirectory:etc}/cronstamps
xml-report = $${rootdirectory:var}/xml_report
cron-entries = $${rootdirectory:etc}/cron.d
crontabs = $${rootdirectory:etc}/crontabs
[cadirectory]
[cadirectory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
...
@@ -249,27 +252,19 @@ config-custom_domain = $${slap-parameter:domain}
...
@@ -249,27 +252,19 @@ config-custom_domain = $${slap-parameter:domain}
recipe = slapos.cookbook:slapmonitor
recipe = slapos.cookbook:slapmonitor
pid-file = $${basedirectory:run}/apache.pid
pid-file = $${basedirectory:run}/apache.pid
database-path = $${basedirectory:log}/slapmonitor.db
database-path = $${basedirectory:log}/slapmonitor.db
shell-path = ${dash:location}/bin/dash
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
path = $${basedirectory:services}/slapmonitor
path = $${basedirectory:services}/slapmonitor
[slapreport]
[slapmonitor-xml]
recipe = slapos.cookbook:slapreport
recipe = slapos.cookbook:slapmonitor-xml
pid-file = $${basedirectory:run}/apache.pid
database-path = $${basedirectory:log}/slapmonitor.db
database-path = $${basedirectory:log}/slapmonitor.db
consumption-log-path = $${basedirectory:log}/instance_consumption.log
slapmonitor-xml-path = ${buildout:bin-directory}/slapmonitor-xml
logbox-ip = 87.98.152.12
path = $${directory:report}/slapmonitor-xml
logbox-port = 5122
logbox-user = admin
logbox-passwd = passer
shell-path = ${dash:location}/bin/dash
slapreport-path = ${buildout:bin-directory}/slapreport
path = $${basedirectory:services}/slapreport
#----------------
#----------------
#--
#--
#-- Publish
all instance parameters (url of instance)
.
#-- Publish
instance parameters
.
[publish-connection-informations]
[publish-connection-informations]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
...
...
stack/lamp/buildout.cfg
View file @
7845378e
...
@@ -70,7 +70,7 @@ mode = 0644
...
@@ -70,7 +70,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
output = ${buildout:directory}/instance-apache-php.cfg
output = ${buildout:directory}/instance-apache-php.cfg
md5sum =
dec36ec4fe54d87f4a5e5b8573f72fb7
md5sum =
fc29d853dcd0802dd61c60b09e898c11
mode = 0644
mode = 0644
[instance-apache-backup]
[instance-apache-backup]
...
@@ -92,7 +92,7 @@ context = key templateapache instance-apache-php:output
...
@@ -92,7 +92,7 @@ context = key templateapache instance-apache-php:output
import-list = file parts template-parts:destination
import-list = file parts template-parts:destination
file replicated template-replicated:destination
file replicated template-replicated:destination
md5sum = 5
151295af3994499e2be6d68938787d3
md5sum = 5
605ad8896c2718854bf26148c4ae940
mode = 0644
mode = 0644
...
@@ -100,7 +100,7 @@ mode = 0644
...
@@ -100,7 +100,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/mariadb/instance-mariadb.cfg.in
url = ${:_profile_base_location_}/mariadb/instance-mariadb.cfg.in
output = ${buildout:directory}/instance-mariadb.cfg
output = ${buildout:directory}/instance-mariadb.cfg
md5sum =
aa33c843f04753a34154467522f0c65e
md5sum =
ba8dd08dfd5e6a9dc614693d066eb21d
mode = 0644
mode = 0644
[instance-mariadb-import]
[instance-mariadb-import]
...
...
stack/lamp/mariadb/instance-mariadb.cfg.in
View file @
7845378e
...
@@ -12,7 +12,7 @@ parts =
...
@@ -12,7 +12,7 @@ parts =
cron
cron
cron-entry-logrotate
cron-entry-logrotate
slapmonitor
slapmonitor
slap
report
slap
monitor-xml
gzip-binary = ${gzip:location}/bin/gzip
gzip-binary = ${gzip:location}/bin/gzip
...
@@ -50,9 +50,11 @@ crontabs = $${rootdirectory:etc}/crontabs
...
@@ -50,9 +50,11 @@ crontabs = $${rootdirectory:etc}/crontabs
cronstamps = $${rootdirectory:etc}/cronstamps
cronstamps = $${rootdirectory:etc}/cronstamps
ca-dir = $${rootdirectory:srv}/ssl
ca-dir = $${rootdirectory:srv}/ssl
mariadb-data = $${rootdirectory:srv}/mariadb
mariadb-data = $${rootdirectory:srv}/mariadb
logrotate-entries = $${rootdirectory:etc}/logrotate.d
logrotate-backup = $${basedirectory:backup}/logrotate
logrotate-backup = $${basedirectory:backup}/logrotate
report = $${rootdirectory:etc}/report
stunnel-conf = $${rootdirectory:etc}/stunnel
stunnel-conf = $${rootdirectory:etc}/stunnel
logrotate-entries = $${rootdirectory:etc}/logrotate.d
xml-report = $${rootdirectory:var}/xml_report
#----------------
#----------------
...
@@ -225,22 +227,14 @@ mysqld-binary = ${mariadb:location}/bin/mysqld
...
@@ -225,22 +227,14 @@ mysqld-binary = ${mariadb:location}/bin/mysqld
recipe = slapos.cookbook:slapmonitor
recipe = slapos.cookbook:slapmonitor
pid-file = $${basedirectory:run}/mariadb.pid
pid-file = $${basedirectory:run}/mariadb.pid
database-path = $${basedirectory:log}/slapmonitor.db
database-path = $${basedirectory:log}/slapmonitor.db
shell-path = ${dash:location}/bin/dash
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
path = $${basedirectory:services}/slapmonitor
path = $${basedirectory:services}/slapmonitor
[slapreport]
[slapmonitor-xml]
recipe = slapos.cookbook:slapreport
recipe = slapos.cookbook:slapmonitor-xml
pid-file = $${basedirectory:run}/mariadb.pid
database-path = $${basedirectory:log}/slapmonitor.db
database-path = $${basedirectory:log}/slapmonitor.db
consumption-log-path = $${basedirectory:log}/instance_consumption.log
slapmonitor-xml-path = ${buildout:bin-directory}/slapmonitor-xml
logbox-ip = 87.98.152.12
path = $${directory:report}/slapmonitor-xml
logbox-port = 5122
logbox-user = admin
logbox-passwd = passer
shell-path = ${dash:location}/bin/dash
slapreport-path = ${buildout:bin-directory}/slapreport
path = $${basedirectory:services}/slapreport
#----------------
#----------------
...
...
stack/lamp/template-resilient.cfg.in
View file @
7845378e
...
@@ -6,7 +6,8 @@
...
@@ -6,7 +6,8 @@
extends =
extends =
{{templateapache}}
{{templateapache}}
parts =
# += because we need to take up parts (like instance-custom, slapmonitor etc) from the profile we extended
parts +=
{{ parts.replicate("mariadb","3") }}
{{ parts.replicate("mariadb","3") }}
request-apache-backup-1
request-apache-backup-1
request-apache-backup-2
request-apache-backup-2
...
...
stack/lapp/apache/instance-apache-php.cfg.in
View file @
7845378e
...
@@ -11,7 +11,8 @@ parts =
...
@@ -11,7 +11,8 @@ parts =
cron-entry-logrotate
cron-entry-logrotate
promise
promise
slapmonitor
slapmonitor
slapreport
slapmonitor-xml
frontend-promise
frontend-promise
content-promise
content-promise
publish-connection-informations
publish-connection-informations
...
@@ -44,16 +45,18 @@ promises = $${rootdirectory:etc}/promise
...
@@ -44,16 +45,18 @@ promises = $${rootdirectory:etc}/promise
[directory]
[directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
cron-entries = $${rootdirectory:etc}/cron.d
crontabs = $${rootdirectory:etc}/crontabs
cronstamps = $${rootdirectory:etc}/cronstamps
ca-dir = $${rootdirectory:srv}/ssl
ca-dir = $${rootdirectory:srv}/ssl
httpd-log = $${basedirectory:log}/apache
httpd-log = $${basedirectory:log}/apache
php-ini-dir = $${rootdirectory:etc}/php
php-ini-dir = $${rootdirectory:etc}/php
tmp-php = $${rootdirectory:tmp}/php
tmp-php = $${rootdirectory:tmp}/php
logrotate-entries = $${rootdirectory:etc}/logrotate.d
logrotate-entries = $${rootdirectory:etc}/logrotate.d
logrotate-backup = $${basedirectory:backup}/logrotate
logrotate-backup = $${basedirectory:backup}/logrotate
report = $${rootdirectory:etc}/report
stunnel-conf = $${rootdirectory:etc}/stunnel
stunnel-conf = $${rootdirectory:etc}/stunnel
cronstamps = $${rootdirectory:etc}/cronstamps
xml-report = $${rootdirectory:var}/xml_report
cron-entries = $${rootdirectory:etc}/cron.d
crontabs = $${rootdirectory:etc}/crontabs
[cadirectory]
[cadirectory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
...
@@ -252,22 +255,14 @@ config-custom_domain = $${slap-parameter:domain}
...
@@ -252,22 +255,14 @@ config-custom_domain = $${slap-parameter:domain}
recipe = slapos.cookbook:slapmonitor
recipe = slapos.cookbook:slapmonitor
pid-file = $${basedirectory:run}/apache.pid
pid-file = $${basedirectory:run}/apache.pid
database-path = $${basedirectory:log}/slapmonitor.db
database-path = $${basedirectory:log}/slapmonitor.db
shell-path = ${dash:location}/bin/dash
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
path = $${basedirectory:services}/slapmonitor
path = $${basedirectory:services}/slapmonitor
[slapreport]
[slapmonitor-xml]
recipe = slapos.cookbook:slapreport
recipe = slapos.cookbook:slapmonitor-xml
pid-file = $${basedirectory:run}/apache.pid
database-path = $${basedirectory:log}/slapmonitor.db
database-path = $${basedirectory:log}/slapmonitor.db
consumption-log-path = $${basedirectory:log}/instance_consumption.log
slapmonitor-xml-path = ${buildout:bin-directory}/slapmonitor-xml
logbox-ip = 87.98.152.12
path = $${directory:report}/slapmonitor-xml
logbox-port = 5122
logbox-user = admin
logbox-passwd = passer
shell-path = ${dash:location}/bin/dash
slapreport-path = ${buildout:bin-directory}/slapreport
path = $${basedirectory:services}/slapreport
#----------------
#----------------
...
...
stack/lapp/buildout.cfg
View file @
7845378e
...
@@ -55,7 +55,7 @@ mode = 0644
...
@@ -55,7 +55,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
output = ${buildout:directory}/instance-apache-php.cfg
output = ${buildout:directory}/instance-apache-php.cfg
md5sum =
fb34918c73ba242ffc08dfd7745367b3
md5sum =
bed286b680bd8cd494da080cdc229f1e
mode = 0644
mode = 0644
[instance-apache-backup]
[instance-apache-backup]
...
@@ -77,7 +77,7 @@ context = key templateapache instance-apache-php:output
...
@@ -77,7 +77,7 @@ context = key templateapache instance-apache-php:output
import-list = file parts template-parts:destination
import-list = file parts template-parts:destination
file replicated template-replicated:destination
file replicated template-replicated:destination
md5sum = 5
bf1aa09d7d608c95d3c54bc50a8b5c1
md5sum = 5
25f50e60d0a96557a552de6afa4ab88
mode = 0644
mode = 0644
...
@@ -85,7 +85,7 @@ mode = 0644
...
@@ -85,7 +85,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 =
8227a2c382e84ddacc733cf998e6cdc3
md5sum =
c5cd2a644fcd8450bc5d13bf53ec9f7d
mode = 0644
mode = 0644
[instance-postgres-import]
[instance-postgres-import]
...
...
stack/lapp/postgres/instance-postgres.cfg.in
View file @
7845378e
...
@@ -12,7 +12,7 @@ parts =
...
@@ -12,7 +12,7 @@ parts =
cron
cron
cron-entry-logrotate
cron-entry-logrotate
slapmonitor
slapmonitor
slap
report
slap
monitor-xml
gzip-binary = ${gzip:location}/bin/gzip
gzip-binary = ${gzip:location}/bin/gzip
...
@@ -50,8 +50,10 @@ crontabs = $${rootdirectory:etc}/crontabs
...
@@ -50,8 +50,10 @@ crontabs = $${rootdirectory:etc}/crontabs
cronstamps = $${rootdirectory:etc}/cronstamps
cronstamps = $${rootdirectory:etc}/cronstamps
ca-dir = $${rootdirectory:srv}/ssl
ca-dir = $${rootdirectory:srv}/ssl
logrotate-backup = $${basedirectory:backup}/logrotate
logrotate-backup = $${basedirectory:backup}/logrotate
report = $${rootdirectory:etc}/report
stunnel-conf = $${rootdirectory:etc}/stunnel
stunnel-conf = $${rootdirectory:etc}/stunnel
logrotate-entries = $${rootdirectory:etc}/logrotate.d
logrotate-entries = $${rootdirectory:etc}/logrotate.d
xml-report = $${rootdirectory:var}/xml_report
#----------------
#----------------
...
@@ -208,22 +210,14 @@ symlink_base = ${postgresql:location}/bin
...
@@ -208,22 +210,14 @@ symlink_base = ${postgresql:location}/bin
recipe = slapos.cookbook:slapmonitor
recipe = slapos.cookbook:slapmonitor
pid-file = $${postgres-instance:pgdata-directory}/postmaster.pid
pid-file = $${postgres-instance:pgdata-directory}/postmaster.pid
database-path = $${basedirectory:log}/slapmonitor.db
database-path = $${basedirectory:log}/slapmonitor.db
shell-path = ${dash:location}/bin/dash
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
path = $${basedirectory:services}/slapmonitor
path = $${basedirectory:services}/slapmonitor
[slapreport]
[slapmonitor-xml]
recipe = slapos.cookbook:slapreport
recipe = slapos.cookbook:slapmonitor-xml
pid-file = $${postgres-instance:pgdata-directory}/postmaster.pid
database-path = $${basedirectory:log}/slapmonitor.db
database-path = $${basedirectory:log}/slapmonitor.db
consumption-log-path = $${basedirectory:log}/instance_consumption.log
slapmonitor-xml-path = ${buildout:bin-directory}/slapmonitor-xml
logbox-ip = 87.98.152.12
path = $${directory:report}/slapmonitor-xml
logbox-port = 5122
logbox-user = admin
logbox-passwd = passer
shell-path = ${dash:location}/bin/dash
slapreport-path = ${buildout:bin-directory}/slapreport
path = $${basedirectory:services}/slapreport
#----------------
#----------------
...
...
stack/lapp/template-resilient.cfg.in
View file @
7845378e
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
extends =
extends =
{{templateapache}}
{{templateapache}}
# += because we need to take up parts (like instance-custom) from the profile we extended
# += because we need to take up parts (like instance-custom
, slapmonitor etc
) from the profile we extended
parts +=
parts +=
{{ parts.replicate("postgres","3") }}
{{ parts.replicate("postgres","3") }}
request-apache-backup-1
request-apache-backup-1
...
...
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