Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos-mynij-dev
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
Mynij
slapos-mynij-dev
Commits
f351f28e
Commit
f351f28e
authored
Feb 04, 2019
by
Guillaume Hervier
Committed by
Thomas Gambier
Mar 26, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/kvm: instance-frontend.cfg.in: Remove unused logrotate stuff.
parent
f660b034
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
51 deletions
+1
-51
software/kvm/buildout.hash.cfg
software/kvm/buildout.hash.cfg
+1
-1
software/kvm/instance-frontend.cfg.in
software/kvm/instance-frontend.cfg.in
+0
-50
No files found.
software/kvm/buildout.hash.cfg
View file @
f351f28e
...
@@ -51,7 +51,7 @@ md5sum = f634a5249b773658b7a7bc9fa9bb0368
...
@@ -51,7 +51,7 @@ md5sum = f634a5249b773658b7a7bc9fa9bb0368
[template-frontend]
[template-frontend]
filename = instance-frontend.cfg.in
filename = instance-frontend.cfg.in
md5sum =
cdb690495e9eb007d2b7d2f8e12f5c59
md5sum =
57a4be74e5afb00e378bc726cd7771f8
[template-ansible-promise]
[template-ansible-promise]
filename = template/ansible-promise.in
filename = template/ansible-promise.in
...
...
software/kvm/instance-frontend.cfg.in
View file @
f351f28e
...
@@ -5,10 +5,6 @@
...
@@ -5,10 +5,6 @@
#############################
#############################
[buildout]
[buildout]
parts =
parts =
logrotate
# logrotate-entry-frontend
cron
cron-entry-logrotate
ca-frontend
ca-frontend
certificate-authority
certificate-authority
frontend-promise-ipv6
frontend-promise-ipv6
...
@@ -37,12 +33,7 @@ backup = $${rootdirectory:srv}/backup
...
@@ -37,12 +33,7 @@ backup = $${rootdirectory:srv}/backup
[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
logrotate-backup = $${basedirectory:backup}/logrotate
logrotate-entries = $${rootdirectory:etc}/logrotate.d
[frontend-instance]
[frontend-instance]
recipe = slapos.cookbook:kvm.frontend
recipe = slapos.cookbook:kvm.frontend
...
@@ -103,49 +94,8 @@ wrapper = $${basedirectory:services}/nodejs
...
@@ -103,49 +94,8 @@ wrapper = $${basedirectory:services}/nodejs
# Put domain name
# Put domain name
name = $${slap-parameter:domain}
name = $${slap-parameter:domain}
[cron]
recipe = slapos.cookbook:cron
dcrond-binary = ${dcron:location}/sbin/crond
cron-entries = $${directory:cron-entries}
crontabs = $${directory:crontabs}
cronstamps = $${directory:cronstamps}
catcher = $${cron-simplelogger:wrapper}
binary = $${basedirectory:services}/crond
[cron-simplelogger]
recipe = slapos.cookbook:simplelogger
wrapper = $${rootdirectory:bin}/cron_simplelogger
log = $${basedirectory:log}/cron.log
[cron-entry-logrotate]
<= cron
recipe = slapos.cookbook:cron.d
name = logrotate
frequency = 0 0 * * *
command = $${logrotate:wrapper}
[logrotate]
recipe = slapos.cookbook:logrotate
# Binaries
logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
gzip-binary = ${gzip:location}/bin/gzip
gunzip-binary = ${gzip:location}/bin/gunzip
# Directories
wrapper = $${rootdirectory:bin}/logrotate
conf = $${rootdirectory:etc}/logrotate.conf
logrotate-entries = $${directory:logrotate-entries}
backup = $${directory:logrotate-backup}
state-file = $${rootdirectory:srv}/logrotate.status
[slap-parameter]
[slap-parameter]
# Default value if no port is specified
# Default value if no port is specified
port = 4443
port = 4443
http-redirection = 0
http-redirection = 0
slave_instance_list =
slave_instance_list =
# [logrotate-entry-frontend]
# <= logrotate
# recipe = slapos.cookbook:logrotate.d
# name = frontend
# log = $${mariadb-instance:error-log} $${mariadb-instance:slow-query-log}
# post = $${mariadb-instance:mysql-binary} --no-defaults -B --socket=$${mariadb-instance:socket} -e "FLUSH LOGS"
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