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
Steven Gueguen
slapos
Commits
8d3ba8b8
Commit
8d3ba8b8
authored
5 years ago
by
Thomas Gambier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/caddy-frontend: Use stack/logrotate instead of redoing it.
parent
9a0e9925
master
1.0
ZODB3
alain-wrapper-recipe
armin
arnau
arnau-RD-future
arnau-RD-py3-master
arnau-RD-pylint-latest
arnau-zope4py2
backup
bbu
cert-auto
cloudooo_test_with_client_certificate
cmf_upgrade_versions
cythonplus
debian12
debug-resiliency
django-tutorial
draft_cloudooo_py3
drupal-lamp
e2e
erp5-component
erp5-zope2-tests
extend-erp5-wcfs-integration-tests
failover-backend
feat/buildout_testing_python3_new
feat/debian11
feat/erp5-frontend
feat/erp5-print_function
feat/erp5-pythonhashseed
feat/fix_kvm_wipe
feat/gitea
feat/ipv6_range
feat/kvm-import-nice
feat/mariadb-10.11
feat/mariadb-10.11bis
feat/mariadb-10.5
feat/mariadb-10.6
feat/mgroonga
feat/obs_test
feat/openssl-3.0
feat/telegraf-version-up
feat/testcase
feat/theia-1.24.0
feat/theia-bash-completions
firefox-version-up
fix-1.0.106.1
fix-1.0.135.1
fix-1.0.135.2
fix-1.0.190.1
fix-1.0.207.1
fix-1.0.240.1
fix-libdb
fix/astroid-redundant-keyword-arg
fix/cloudooo-rpath
fix/erp5_remove_unused_eggs
fix/erp5_soft_url_promise
fix/haproxy-up
fix/jinja2_version_up
fix/resilient_test
fix/slapos.toolbox-py2
fix_kvm_monitor
fix_slapos_node
for_testrunner_1
galene_improvements
gitlab-fixup
gitlab-prod
gitlab-upgrade
goodbye-openssl-1.0.x
html5as
html5as-base
html5as-test
html5as-tutorial
improve-monitor-httpd
inkscape_upgrade_debian12
intentially_broken_cloudooo
json-api
kvm_auto_reboot
lle-bout/ppc64le
logrotate/truncate
mail-server
mariadb-no-tests
master+ZODB4-wc2
matomo-tutorial
moodle
my2to3
netframe
nextcloud
nextcloud-fix-tests
nirina_tutorial
nofile
old-mail-server
ors
ors-dev2
ors-dev3
ors-dnsmasq
ors-handover
ors-ims
ors-oran-ru
ors-oran-ru-toolbox
ors-promise
ors-ptt
ors-publish
ors-tests
ors_fixed_ips
osc
patrowl-dev
php-7
proview-r
re6st-compilation
re6st-py3
re6st-py3-package
remove_inkscape
remove_tempstorage
repman-1.0
repman-test
resilience_all_parameters
revert-e7b48c0b
roque_selenium
ru-alarms
runner-multi-sr
scalability_crash_mariadb
sozu-dev
stack/supervisord
systemd-python
tdd_config_5ms_6ul_3dl
test-fix-erp5-resiliency
textsynth
tomo_fix_erp5
tomo_fix_kvm
tomo_openradio_e2e_testing
top-stand1
ttrm-novel-fix-testnode
ttrn
upgrade_erp5_test_updated
upgrade_responses
warp10
webdav
wipapi
xy/lte-multiru
y/wc2-next
zope2py2-reorder-versions-priority
zope2zope4py2
zope4
zope4py2-faketime
zope4py3
zope4py3-bstr
1.0.353
1.0.352
1.0.351
1.0.350
1.0.349
1.0.348
1.0.347
1.0.346
1.0.345
1.0.344.1
1.0.344
1.0.343
1.0.342
1.0.341
1.0.340
1.0.339
1.0.338
1.0.337
1.0.336
1.0.335
1.0.334
1.0.333
1.0.332
1.0.331
1.0.330
1.0.329
1.0.328
1.0.327
1.0.326
1.0.325
1.0.324
1.0.323
1.0.322
1.0.321
1.0.320
1.0.319
1.0.318
1.0.317
1.0.316
1.0.315
1.0.314
1.0.313
1.0.312
1.0.311
1.0.310
1.0.309
1.0.308
1.0.307
1.0.306
1.0.305
1.0.304
1.0.303
1.0.302
1.0.301
1.0.300
1.0.299
1.0.298
1.0.297
1.0.296
1.0.295
1.0.294
1.0.293
1.0.292
1.0.291
1.0.290
1.0.289
1.0.288
1.0.287
1.0.286
1.0.285
1.0.284
1.0.283
1.0.282
1.0.281
1.0.280
1.0.279
1.0.278
1.0.277
1.0.276
1.0.275
1.0.274
1.0.273
1.0.272
1.0.271
1.0.270
1.0.269
1.0.268
1.0.267
1.0.266
1.0.265
1.0.264
1.0.263
1.0.262
1.0.261
1.0.260
1.0.259
1.0.258
1.0.257
1.0.256
1.0.255
1.0.254
1.0.253
1.0.252
1.0.251
1.0.250
1.0.249
1.0.248
1.0.247
1.0.246
1.0.245
1.0.244
1.0.243
1.0.242
1.0.241
1.0.240.1
1.0.240
1.0.239
1.0.238
1.0.237
1.0.236
1.0.235
1.0.234
1.0.233
1.0.232
1.0.231
1.0.230
1.0.229
1.0.228
1.0.227
1.0.226
1.0.225
1.0.224
1.0.223
1.0.222
1.0.221
1.0.220
1.0.219
1.0.218
1.0.217
1.0.216
1.0.215
1.0.214
1.0.213
1.0.212
1.0.211
1.0.210
1.0.209
1.0.208
1.0.207.1
1.0.207
1.0.206
1.0.205
1.0.204
1.0.203
1.0.202
1.0.201
1.0.200
1.0.199
1.0.198
1.0.197
1.0.196
1.0.195
1.0.194
1.0.193
1.0.192
1.0.191
1.0.190.1
1.0.190
1.0.189
1.0.188
1.0.187
1.0.186
1.0.185
1.0.184
1.0.183
1.0.182
1.0.181
1.0.180
1.0.179
1.0.178
1.0.177
1.0.176
1.0.175
1.0.174
1.0.173
1.0.172
1.0.171
1.0.170
1.0.169
1.0.168
1.0.167.10
1.0.167.9
1.0.167.8
1.0.167.7
1.0.167.6
1.0.167.5
1.0.167.4
1.0.167.3
1.0.167.2
1.0.167.1
1.0.167
1.0.166
1.0.165
1.0.164
1.0.163
1.0.162
1.0.161.1
1.0.161
1.0.160
1.0.159
1.0.158
1.0.157
1.0.156
1.0.155
1.0.154
1.0.153
1.0.152
1.0.151
1.0.150
1.0.149
1.0.148
1.0.147
1.0.146
1.0.145
1.0.144
1.0.143
1.0.142
1.0.141
1.0.140
1.0.137
1.0.136
1.0.135.2
1.0.135.1
1.0.135
1.0.134
1.0.133
1.0.132
1.0.131
1.0.130
1.0.129
1.0.128
1.0.127
1.0.126
1.0.125
1.0.124
1.0.123
1.0.122
1.0.121
1.0.120
1.0.119
1.0.118
1.0.117
1.0.116
1.0.115
1.0.114
1.0.113
1.0.112
1.0.111
1.0.110
1.0.109
1.0.108
1.0.107
1.0.106.1
1.0.106
1.0.105
1.0.104
1.0.103
1.0.102
1.0.101
1.0.100
1.0.99
slapos.cookbook-1.0.124
seleniumrunner-firefox60
re6stnet-0.551+2
re6stnet-0.548+3
re6stnet-0.541+1
re6stnet-0.539+3
re6stnet-0.539+2
re6stnet-0.539+1
re6stnet-0.536+2
No related merge requests found
Changes
26
Show whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
60 additions
and
144 deletions
+60
-144
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+3
-3
software/caddy-frontend/common.cfg
software/caddy-frontend/common.cfg
+1
-3
software/caddy-frontend/instance-apache-frontend.cfg.in
software/caddy-frontend/instance-apache-frontend.cfg.in
+7
-60
software/caddy-frontend/instance-kedifa.cfg.in
software/caddy-frontend/instance-kedifa.cfg.in
+0
-7
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
.../caddy-frontend/templates/apache-custom-slave-list.cfg.in
+6
-10
software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_supervisor_state-CADDY.txt
...stDefaultMonitorHttpdPort.test_supervisor_state-CADDY.txt
+2
-3
software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_supervisor_state-CADDY.txt
...uplicateSiteKeyProtection.test_supervisor_state-CADDY.txt
+2
-3
software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt
...ttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt
+2
-3
software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt
...ltSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt
+2
-3
software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt
...eHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt
+2
-3
software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt
...seSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt
+2
-3
software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_supervisor_state-CADDY.txt
...stMalformedBackenUrlSlave.test_supervisor_state-CADDY.txt
+2
-3
software/caddy-frontend/test/test_data/test.TestMasterRequest.test_supervisor_state-CADDY.txt
...ta/test.TestMasterRequest.test_supervisor_state-CADDY.txt
+2
-3
software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_supervisor_state-CADDY.txt
...t.TestMasterRequestDomain.test_supervisor_state-CADDY.txt
+2
-3
software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_supervisor_state-CADDY.txt
...data/test.TestQuicEnabled.test_supervisor_state-CADDY.txt
+2
-3
software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-CADDY.txt
...rificationUrlDefaultSlave.test_supervisor_state-CADDY.txt
+2
-3
software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_supervisor_state-CADDY.txt
...Re6stVerificationUrlSlave.test_supervisor_state-CADDY.txt
+2
-3
software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_supervisor_state-CADDY.txt
...a/test.TestReplicateSlave.test_supervisor_state-CADDY.txt
+3
-5
software/caddy-frontend/test/test_data/test.TestSlave.test_supervisor_state-CADDY.txt
.../test_data/test.TestSlave.test_supervisor_state-CADDY.txt
+2
-3
software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_supervisor_state-CADDY.txt
...st.TestSlaveBadParameters.test_supervisor_state-CADDY.txt
+2
-3
software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt
...stSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt
+2
-3
software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_supervisor_state-CADDY.txt
...rCertificateCompatibility.test_supervisor_state-CADDY.txt
+2
-3
software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_supervisor_state-CADDY.txt
...mpatibilityOverrideMaster.test_supervisor_state-CADDY.txt
+2
-3
software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_supervisor_state-CADDY.txt
...ficateCompatibilityUpdate.test_supervisor_state-CADDY.txt
+2
-3
stack/logrotate/buildout.hash.cfg
stack/logrotate/buildout.hash.cfg
+1
-1
stack/logrotate/instance-logrotate-base.cfg.in
stack/logrotate/instance-logrotate-base.cfg.in
+3
-1
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
8d3ba8b8
...
...
@@ -22,7 +22,7 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b
[template-apache-frontend]
filename = instance-apache-frontend.cfg.in
md5sum =
e5fa926695de04c5bff54cd8128227a3
md5sum =
abbbc8f24cdef389b9b2859b0ef8dd0e
[template-apache-replicate]
filename = instance-apache-replicate.cfg.in
...
...
@@ -30,7 +30,7 @@ md5sum = 81ad603fe0a1e29948bd81b457e8d7a4
[template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
md5sum =
8bed2dcba7904a765c29cf8349b7d5cc
md5sum =
dfbe4378610aa42f2cbc2a55d386324e
[template-slave-configuration]
filename = templates/custom-virtualhost.conf.in
...
...
@@ -122,4 +122,4 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8
[template-kedifa]
filename = instance-kedifa.cfg.in
md5sum =
66de9edcd66447271424be3d92c2cb90
md5sum =
5597b2184b445af69ad6d517d0729ad6
This diff is collapsed.
Click to expand it.
software/caddy-frontend/common.cfg
View file @
8d3ba8b8
...
...
@@ -5,7 +5,6 @@ extends =
../../component/dash/buildout.cfg
../../component/caddy/buildout.cfg
../../component/gzip/buildout.cfg
../../component/dcron/buildout.cfg
../../component/logrotate/buildout.cfg
../../component/rdiff-backup/buildout.cfg
../../component/trafficserver/buildout.cfg
...
...
@@ -22,7 +21,6 @@ parts +=
template-caddy-replicate
caddy
dcron
logrotate
rdiff-backup
npm-modules
...
...
@@ -97,6 +95,7 @@ context =
[template-frontend-parameter-section]
common_profile = ${template-common:rendered}
logrotate_base_instance = ${template-logrotate-base:rendered}
bin_directory = ${buildout:bin-directory}
...
...
@@ -105,7 +104,6 @@ caddy = ${caddy:output}
caddy_location = ${caddy:location}
curl = ${curl:location}
dash = ${dash:location}
dcron = ${dcron:location}
gzip = ${gzip:location}
logrotate = ${logrotate:location}
openssl = ${openssl:location}/bin/openssl
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/instance-apache-frontend.cfg.in
View file @
8d3ba8b8
...
...
@@ -5,13 +5,11 @@
extends =
{{ parameter_dict['common_profile'] }}
{{ parameter_dict['monitor_template'] }}
{{ parameter_dict['logrotate_base_instance'] }}
parts =
directory
configtest
logrotate
cron
cron-entry-logrotate
logrotate-entry-caddy
logrotate-entry-nginx
caddy-frontend
...
...
@@ -78,12 +76,6 @@ etc-run = ${:etc}/run
promise = ${:etc}/promise
plugin = ${:etc}/plugin
logrotate-backup = ${:backup}/logrotate
logrotate-entries = ${:etc}/logrotate.d
cron-entries = ${:etc}/cron.d
crontabs = ${:etc}/crontabs
cronstamps = ${:etc}/cronstamps
ca-dir = ${:srv}/ssl
# BBB: SlapOS Master non-zero knowledge BEGIN
bbb-ssl-dir = ${:srv}/bbb-ssl
...
...
@@ -148,6 +140,7 @@ context =
import json_module json
import os_module os
raw common_profile {{ parameter_dict['common_profile'] }}
raw logrotate_base_instance {{ parameter_dict['logrotate_base_instance'] }}
key slap_software_type :slap_software_type
key slapparameter_dict :slapparameter_dict
section directory directory
...
...
@@ -266,7 +259,6 @@ extra-context =
key template_notebook_slave_configuration software-release-path:template-nginx-notebook-slave-virtualhost
key software_type :software_type
key frontend_lazy_graceful_reload frontend-caddy-lazy-graceful:rendered
section logrotate_dict logrotate
section frontend_configuration frontend-configuration
section caddy_configuration caddy-configuration
section nginx_configuration nginx-configuration
...
...
@@ -418,64 +410,19 @@ extra-context =
key content :content
# BBB: SlapOS Master non-zero knowledge END
[cron]
recipe = slapos.cookbook:cron
dcrond-binary = {{ parameter_dict['dcron'] }}/sbin/crond
cron-entries = ${directory:cron-entries}
crontabs = ${directory:crontabs}
cronstamps = ${directory:cronstamps}
catcher = ${cron-simplelogger:wrapper}
binary = ${directory:service}/crond
[cron-simplelogger]
recipe = slapos.cookbook:simplelogger
wrapper = ${directory:bin}/cron_simplelogger
log = ${directory:log}/cron.log
[cron-entry-logrotate]
<= cron
recipe = slapos.cookbook:cron.d
name = logrotate
frequency = 0 0 * * *
command = ${logrotate:wrapper}
# Deploy Logrotate
[logrotate]
recipe = slapos.cookbook:logrotate
# Binaries
logrotate-binary = {{ parameter_dict['logrotate'] }}/sbin/logrotate
gzip-binary = {{ parameter_dict['gzip'] }}/bin/gzip
gunzip-binary = {{ parameter_dict['gzip'] }}/bin/gunzip
# Directories
wrapper = ${directory:bin}/logrotate
conf = ${directory:etc}/logrotate.conf
logrotate-entries = ${directory:logrotate-entries}
backup = ${directory:logrotate-backup}
state-file = ${directory:srv}/logrotate.status
[logrotate-entry-caddy]
<= logrotate
recipe = slapos.cookbook:logrotate.d
<= logrotate-entry-base
name = caddy
log = ${caddy-configuration:error-log} ${caddy-configuration:access-log}
frequency = daily
rotatep-num = 30
rotate-num = 30
post = ${frontend-caddy-lazy-graceful:rendered} &
sharedscripts = true
notifempty = true
create = true
[logrotate-entry-nginx]
<= logrotate
recipe = slapos.cookbook:logrotate.d
<= logrotate-entry-base
name = caddy-nginx
log = ${nginx-configuration:error_log} ${nginx-configuration:access_log}
frequency = daily
rotatep-num = 30
rotate-num = 30
post = ${nginx-configuration:nginx-graceful-command}
sharedscripts = true
notifempty = true
create = true
#################
# Trafficserver
...
...
@@ -740,7 +687,7 @@ monitor-httpd-port = {{ monitor_httpd_port | int }}
[monitor-conf-parameters]
private-path-list +=
${directory:logrotate-backup}
${
logrotate-
directory:logrotate-backup}
[monitor-traffic-summary-last-stats-wrapper]
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/instance-kedifa.cfg.in
View file @
8d3ba8b8
...
...
@@ -51,13 +51,6 @@ service = ${:etc}/service
etc-run = ${:etc}/run
promise = ${:etc}/promise
logrotate-backup = ${:backup}/logrotate
logrotate-entries = ${:etc}/logrotate.d
cron-entries = ${:etc}/cron.d
crontabs = ${:etc}/crontabs
cronstamps = ${:etc}/cronstamps
# KeDiFa directories
kedifa = ${:srv}/kedifa
etc-kedifa = ${:etc}/kedifa
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
View file @
8d3ba8b8
...
...
@@ -24,12 +24,6 @@ context =
raw common_profile {{ common_profile }}
${:extra-context}
{% do logrotate_dict.pop('recipe') %}
[logrotate]
{% for key, value in logrotate_dict.iteritems() %}
{{ key }} = {{ value }}
{% endfor %}
post = {{ frontend_lazy_graceful_reload }} &
frequency = daily
rotatep-num = 30
...
...
@@ -82,7 +76,7 @@ output = {{ plugin_directory }}/${:name}
{% do part_list.extend([slave_ln_section]) %}
{% do part_list.extend([slave_logrotate_section, slave_section_title]) %}
{% set slave_log_folder =
logrotate_dict.get('backup') + '
/' + slave_reference + "-logs" %}
{% set slave_log_folder =
'${logrotate-directory:logrotate-backup}
/' + slave_reference + "-logs" %}
{# Pass HTTP2 switch #}
{% do slave_instance.__setitem__('enable_http2_by_default', enable_http2_by_default) %}
...
...
@@ -161,8 +155,7 @@ extra-context =
{# Set slave logrotate entry #}
[{{slave_logrotate_section}}]
<= logrotate
recipe = slapos.cookbook:logrotate.d
<= logrotate-entry-base
name = ${:_buildout_section_name_}
log = {{slave_parameter_dict.get('access_log')}} {{slave_parameter_dict.get('error_log')}}
backup = {{ slave_log_folder }}
...
...
@@ -501,7 +494,10 @@ csr_id-url = https://[${expose-csr_id-configuration:ip}]:${expose-csr_id-configu
csr_id-certificate = ${get-csr_id-certificate:certificate}
[buildout]
extends = {{ common_profile }}
extends =
{{ common_profile }}
{{ logrotate_base_instance }}
parts +=
{% for part in part_list %}
{{ ' %s' % part }}
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_supervisor_state-CADDY.txt
View file @
8d3ba8b8
T-0:bootstrap-monitor EXITED
T-0:certificate_authority-{hash}-on-watch RUNNING
T-0:crond-{hash} RUNNING
T-0:crond-{hash}
-on-watch
RUNNING
T-0:monitor-httpd-{hash}-on-watch EXITED
T-0:monitor-httpd-graceful EXITED
T-1:caucase-updater-on-watch RUNNING
...
...
@@ -16,8 +16,7 @@ T-2:6tunnel-26011-{hash}-on-watch STOPPED
T-2:6tunnel-26012-{hash}-on-watch STOPPED
T-2:bootstrap-monitor STOPPED
T-2:certificate_authority-{hash}-on-watch STOPPED
T-2:crond-{hash} STOPPED
T-2:crond-on-watch STOPPED
T-2:crond-{hash}-on-watch STOPPED
T-2:expose-csr_id-{hash}-on-watch STOPPED
T-2:frontend-caddy-safe-graceful STOPPED
T-2:frontend-nginx-safe-graceful STOPPED
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_supervisor_state-CADDY.txt
View file @
8d3ba8b8
T-0:bootstrap-monitor EXITED
T-0:certificate_authority-{hash}-on-watch RUNNING
T-0:crond-{hash} RUNNING
T-0:crond-{hash}
-on-watch
RUNNING
T-0:monitor-httpd-{hash}-on-watch RUNNING
T-0:monitor-httpd-graceful EXITED
T-1:caucase-updater-on-watch RUNNING
...
...
@@ -16,8 +16,7 @@ T-2:6tunnel-26011-{hash}-on-watch RUNNING
T-2:6tunnel-26012-{hash}-on-watch RUNNING
T-2:bootstrap-monitor EXITED
T-2:certificate_authority-{hash}-on-watch RUNNING
T-2:crond-{hash} RUNNING
T-2:crond-on-watch RUNNING
T-2:crond-{hash}-on-watch RUNNING
T-2:expose-csr_id-{hash}-on-watch RUNNING
T-2:frontend-caddy-safe-graceful EXITED
T-2:frontend-nginx-safe-graceful EXITED
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt
View file @
8d3ba8b8
T-0:bootstrap-monitor EXITED
T-0:certificate_authority-{hash}-on-watch RUNNING
T-0:crond-{hash} RUNNING
T-0:crond-{hash}
-on-watch
RUNNING
T-0:monitor-httpd-{hash}-on-watch RUNNING
T-0:monitor-httpd-graceful EXITED
T-1:caucase-updater-on-watch RUNNING
...
...
@@ -16,8 +16,7 @@ T-2:6tunnel-26011-{hash}-on-watch RUNNING
T-2:6tunnel-26012-{hash}-on-watch RUNNING
T-2:bootstrap-monitor EXITED
T-2:certificate_authority-{hash}-on-watch RUNNING
T-2:crond-{hash} RUNNING
T-2:crond-on-watch RUNNING
T-2:crond-{hash}-on-watch RUNNING
T-2:expose-csr_id-{hash}-on-watch RUNNING
T-2:frontend-caddy-safe-graceful EXITED
T-2:frontend-nginx-safe-graceful EXITED
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt
View file @
8d3ba8b8
T-0:bootstrap-monitor EXITED
T-0:certificate_authority-{hash}-on-watch RUNNING
T-0:crond-{hash} RUNNING
T-0:crond-{hash}
-on-watch
RUNNING
T-0:monitor-httpd-{hash}-on-watch RUNNING
T-0:monitor-httpd-graceful EXITED
T-1:caucase-updater-on-watch RUNNING
...
...
@@ -16,8 +16,7 @@ T-2:6tunnel-26011-{hash}-on-watch RUNNING
T-2:6tunnel-26012-{hash}-on-watch RUNNING
T-2:bootstrap-monitor EXITED
T-2:certificate_authority-{hash}-on-watch RUNNING
T-2:crond-{hash} RUNNING
T-2:crond-on-watch RUNNING
T-2:crond-{hash}-on-watch RUNNING
T-2:expose-csr_id-{hash}-on-watch RUNNING
T-2:frontend-caddy-safe-graceful EXITED
T-2:frontend-nginx-safe-graceful EXITED
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt
View file @
8d3ba8b8
T-0:bootstrap-monitor EXITED
T-0:certificate_authority-{hash}-on-watch RUNNING
T-0:crond-{hash} RUNNING
T-0:crond-{hash}
-on-watch
RUNNING
T-0:monitor-httpd-{hash}-on-watch RUNNING
T-0:monitor-httpd-graceful EXITED
T-1:caucase-updater-on-watch RUNNING
...
...
@@ -16,8 +16,7 @@ T-2:6tunnel-26011-{hash}-on-watch RUNNING
T-2:6tunnel-26012-{hash}-on-watch RUNNING
T-2:bootstrap-monitor EXITED
T-2:certificate_authority-{hash}-on-watch RUNNING
T-2:crond-{hash} RUNNING
T-2:crond-on-watch RUNNING
T-2:crond-{hash}-on-watch RUNNING
T-2:expose-csr_id-{hash}-on-watch RUNNING
T-2:frontend-caddy-safe-graceful EXITED
T-2:frontend-nginx-safe-graceful EXITED
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt
View file @
8d3ba8b8
T-0:bootstrap-monitor EXITED
T-0:certificate_authority-{hash}-on-watch RUNNING
T-0:crond-{hash} RUNNING
T-0:crond-{hash}
-on-watch
RUNNING
T-0:monitor-httpd-{hash}-on-watch RUNNING
T-0:monitor-httpd-graceful EXITED
T-1:caucase-updater-on-watch RUNNING
...
...
@@ -16,8 +16,7 @@ T-2:6tunnel-26011-{hash}-on-watch RUNNING
T-2:6tunnel-26012-{hash}-on-watch RUNNING
T-2:bootstrap-monitor EXITED
T-2:certificate_authority-{hash}-on-watch RUNNING
T-2:crond-{hash} RUNNING
T-2:crond-on-watch RUNNING
T-2:crond-{hash}-on-watch RUNNING
T-2:expose-csr_id-{hash}-on-watch RUNNING
T-2:frontend-caddy-safe-graceful EXITED
T-2:frontend-nginx-safe-graceful EXITED
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_supervisor_state-CADDY.txt
View file @
8d3ba8b8
T-0:bootstrap-monitor EXITED
T-0:certificate_authority-{hash}-on-watch RUNNING
T-0:crond-{hash} RUNNING
T-0:crond-{hash}
-on-watch
RUNNING
T-0:monitor-httpd-{hash}-on-watch RUNNING
T-0:monitor-httpd-graceful EXITED
T-1:caucase-updater-on-watch RUNNING
...
...
@@ -16,8 +16,7 @@ T-2:6tunnel-26011-{hash}-on-watch RUNNING
T-2:6tunnel-26012-{hash}-on-watch RUNNING
T-2:bootstrap-monitor EXITED
T-2:certificate_authority-{hash}-on-watch RUNNING
T-2:crond-{hash} RUNNING
T-2:crond-on-watch RUNNING
T-2:crond-{hash}-on-watch RUNNING
T-2:expose-csr_id-{hash}-on-watch RUNNING
T-2:frontend-caddy-safe-graceful EXITED
T-2:frontend-nginx-safe-graceful EXITED
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestMasterRequest.test_supervisor_state-CADDY.txt
View file @
8d3ba8b8
T-0:bootstrap-monitor EXITED
T-0:certificate_authority-{hash}-on-watch RUNNING
T-0:crond-{hash} RUNNING
T-0:crond-{hash}
-on-watch
RUNNING
T-0:monitor-httpd-{hash}-on-watch RUNNING
T-0:monitor-httpd-graceful EXITED
T-1:caucase-updater-on-watch RUNNING
...
...
@@ -16,8 +16,7 @@ T-2:6tunnel-26011-{hash}-on-watch RUNNING
T-2:6tunnel-26012-{hash}-on-watch RUNNING
T-2:bootstrap-monitor EXITED
T-2:certificate_authority-{hash}-on-watch RUNNING
T-2:crond-{hash} RUNNING
T-2:crond-on-watch RUNNING
T-2:crond-{hash}-on-watch RUNNING
T-2:expose-csr_id-{hash}-on-watch RUNNING
T-2:frontend-caddy-safe-graceful EXITED
T-2:frontend-nginx-safe-graceful EXITED
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_supervisor_state-CADDY.txt
View file @
8d3ba8b8
T-0:bootstrap-monitor EXITED
T-0:certificate_authority-{hash}-on-watch RUNNING
T-0:crond-{hash} RUNNING
T-0:crond-{hash}
-on-watch
RUNNING
T-0:monitor-httpd-{hash}-on-watch RUNNING
T-0:monitor-httpd-graceful EXITED
T-1:caucase-updater-on-watch RUNNING
...
...
@@ -16,8 +16,7 @@ T-2:6tunnel-26011-{hash}-on-watch RUNNING
T-2:6tunnel-26012-{hash}-on-watch RUNNING
T-2:bootstrap-monitor EXITED
T-2:certificate_authority-{hash}-on-watch RUNNING
T-2:crond-{hash} RUNNING
T-2:crond-on-watch RUNNING
T-2:crond-{hash}-on-watch RUNNING
T-2:expose-csr_id-{hash}-on-watch RUNNING
T-2:frontend-caddy-safe-graceful EXITED
T-2:frontend-nginx-safe-graceful EXITED
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_supervisor_state-CADDY.txt
View file @
8d3ba8b8
T-0:bootstrap-monitor EXITED
T-0:certificate_authority-{hash}-on-watch RUNNING
T-0:crond-{hash} RUNNING
T-0:crond-{hash}
-on-watch
RUNNING
T-0:monitor-httpd-{hash}-on-watch RUNNING
T-0:monitor-httpd-graceful EXITED
T-1:caucase-updater-on-watch RUNNING
...
...
@@ -16,8 +16,7 @@ T-2:6tunnel-26011-{hash}-on-watch RUNNING
T-2:6tunnel-26012-{hash}-on-watch RUNNING
T-2:bootstrap-monitor EXITED
T-2:certificate_authority-{hash}-on-watch RUNNING
T-2:crond-{hash} RUNNING
T-2:crond-on-watch RUNNING
T-2:crond-{hash}-on-watch RUNNING
T-2:expose-csr_id-{hash}-on-watch RUNNING
T-2:frontend-caddy-safe-graceful EXITED
T-2:frontend-nginx-safe-graceful EXITED
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-CADDY.txt
View file @
8d3ba8b8
T-0:bootstrap-monitor EXITED
T-0:certificate_authority-{hash}-on-watch RUNNING
T-0:crond-{hash} RUNNING
T-0:crond-{hash}
-on-watch
RUNNING
T-0:monitor-httpd-{hash}-on-watch RUNNING
T-0:monitor-httpd-graceful EXITED
T-1:caucase-updater-on-watch RUNNING
...
...
@@ -16,8 +16,7 @@ T-2:6tunnel-26011-{hash}-on-watch RUNNING
T-2:6tunnel-26012-{hash}-on-watch RUNNING
T-2:bootstrap-monitor EXITED
T-2:certificate_authority-{hash}-on-watch RUNNING
T-2:crond-{hash} RUNNING
T-2:crond-on-watch RUNNING
T-2:crond-{hash}-on-watch RUNNING
T-2:expose-csr_id-{hash}-on-watch RUNNING
T-2:frontend-caddy-safe-graceful EXITED
T-2:frontend-nginx-safe-graceful EXITED
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_supervisor_state-CADDY.txt
View file @
8d3ba8b8
T-0:bootstrap-monitor EXITED
T-0:certificate_authority-{hash}-on-watch RUNNING
T-0:crond-{hash} RUNNING
T-0:crond-{hash}
-on-watch
RUNNING
T-0:monitor-httpd-{hash}-on-watch RUNNING
T-0:monitor-httpd-graceful EXITED
T-1:caucase-updater-on-watch RUNNING
...
...
@@ -16,8 +16,7 @@ T-2:6tunnel-26011-{hash}-on-watch RUNNING
T-2:6tunnel-26012-{hash}-on-watch RUNNING
T-2:bootstrap-monitor EXITED
T-2:certificate_authority-{hash}-on-watch RUNNING
T-2:crond-{hash} RUNNING
T-2:crond-on-watch RUNNING
T-2:crond-{hash}-on-watch RUNNING
T-2:expose-csr_id-{hash}-on-watch RUNNING
T-2:frontend-caddy-safe-graceful EXITED
T-2:frontend-nginx-safe-graceful EXITED
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_supervisor_state-CADDY.txt
View file @
8d3ba8b8
T-0:bootstrap-monitor EXITED
T-0:certificate_authority-{hash}-on-watch RUNNING
T-0:crond-{hash} RUNNING
T-0:crond-{hash}
-on-watch
RUNNING
T-0:monitor-httpd-{hash}-on-watch RUNNING
T-0:monitor-httpd-graceful EXITED
T-1:caucase-updater-on-watch RUNNING
...
...
@@ -16,8 +16,7 @@ T-2:6tunnel-26011-{hash}-on-watch RUNNING
T-2:6tunnel-26012-{hash}-on-watch RUNNING
T-2:bootstrap-monitor EXITED
T-2:certificate_authority-{hash}-on-watch RUNNING
T-2:crond-{hash} RUNNING
T-2:crond-on-watch RUNNING
T-2:crond-{hash}-on-watch RUNNING
T-2:expose-csr_id-{hash}-on-watch RUNNING
T-2:frontend-caddy-safe-graceful EXITED
T-2:frontend-nginx-safe-graceful EXITED
...
...
@@ -36,8 +35,7 @@ T-3:6tunnel-26011-{hash}-on-watch STOPPED
T-3:6tunnel-26012-{hash}-on-watch STOPPED
T-3:bootstrap-monitor STOPPED
T-3:certificate_authority-{hash}-on-watch STOPPED
T-3:crond-{hash} STOPPED
T-3:crond-on-watch STOPPED
T-3:crond-{hash}-on-watch STOPPED
T-3:expose-csr_id-{hash}-on-watch STOPPED
T-3:frontend-caddy-safe-graceful STOPPED
T-3:frontend-nginx-safe-graceful STOPPED
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestSlave.test_supervisor_state-CADDY.txt
View file @
8d3ba8b8
T-0:bootstrap-monitor EXITED
T-0:certificate_authority-{hash}-on-watch RUNNING
T-0:crond-{hash} RUNNING
T-0:crond-{hash}
-on-watch
RUNNING
T-0:monitor-httpd-{hash}-on-watch RUNNING
T-0:monitor-httpd-graceful EXITED
T-1:caucase-updater-on-watch RUNNING
...
...
@@ -16,8 +16,7 @@ T-2:6tunnel-26011-{hash}-on-watch RUNNING
T-2:6tunnel-26012-{hash}-on-watch RUNNING
T-2:bootstrap-monitor EXITED
T-2:certificate_authority-{hash}-on-watch RUNNING
T-2:crond-{hash} RUNNING
T-2:crond-on-watch RUNNING
T-2:crond-{hash}-on-watch RUNNING
T-2:expose-csr_id-{hash}-on-watch RUNNING
T-2:frontend-caddy-safe-graceful EXITED
T-2:frontend-nginx-safe-graceful EXITED
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_supervisor_state-CADDY.txt
View file @
8d3ba8b8
T-0:bootstrap-monitor EXITED
T-0:certificate_authority-{hash}-on-watch RUNNING
T-0:crond-{hash} RUNNING
T-0:crond-{hash}
-on-watch
RUNNING
T-0:monitor-httpd-{hash}-on-watch RUNNING
T-0:monitor-httpd-graceful EXITED
T-1:caucase-updater-on-watch RUNNING
...
...
@@ -16,8 +16,7 @@ T-2:6tunnel-26011-{hash}-on-watch RUNNING
T-2:6tunnel-26012-{hash}-on-watch RUNNING
T-2:bootstrap-monitor EXITED
T-2:certificate_authority-{hash}-on-watch RUNNING
T-2:crond-{hash} RUNNING
T-2:crond-on-watch RUNNING
T-2:crond-{hash}-on-watch RUNNING
T-2:expose-csr_id-{hash}-on-watch RUNNING
T-2:frontend-caddy-safe-graceful EXITED
T-2:frontend-nginx-safe-graceful EXITED
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt
View file @
8d3ba8b8
T-0:bootstrap-monitor EXITED
T-0:certificate_authority-{hash}-on-watch RUNNING
T-0:crond-{hash} RUNNING
T-0:crond-{hash}
-on-watch
RUNNING
T-0:monitor-httpd-{hash}-on-watch RUNNING
T-0:monitor-httpd-graceful EXITED
T-1:caucase-updater-on-watch RUNNING
...
...
@@ -16,8 +16,7 @@ T-2:6tunnel-26011-{hash}-on-watch RUNNING
T-2:6tunnel-26012-{hash}-on-watch RUNNING
T-2:bootstrap-monitor EXITED
T-2:certificate_authority-{hash}-on-watch RUNNING
T-2:crond-{hash} RUNNING
T-2:crond-on-watch RUNNING
T-2:crond-{hash}-on-watch RUNNING
T-2:expose-csr_id-{hash}-on-watch RUNNING
T-2:frontend-caddy-safe-graceful EXITED
T-2:frontend-nginx-safe-graceful EXITED
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_supervisor_state-CADDY.txt
View file @
8d3ba8b8
T-0:bootstrap-monitor EXITED
T-0:certificate_authority-{hash}-on-watch RUNNING
T-0:crond-{hash} RUNNING
T-0:crond-{hash}
-on-watch
RUNNING
T-0:monitor-httpd-{hash}-on-watch RUNNING
T-0:monitor-httpd-graceful EXITED
T-1:caucase-updater-on-watch RUNNING
...
...
@@ -16,8 +16,7 @@ T-2:6tunnel-26011-{hash}-on-watch RUNNING
T-2:6tunnel-26012-{hash}-on-watch RUNNING
T-2:bootstrap-monitor EXITED
T-2:certificate_authority-{hash}-on-watch RUNNING
T-2:crond-{hash} RUNNING
T-2:crond-on-watch RUNNING
T-2:crond-{hash}-on-watch RUNNING
T-2:expose-csr_id-{hash}-on-watch RUNNING
T-2:frontend-caddy-safe-graceful EXITED
T-2:frontend-nginx-safe-graceful EXITED
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_supervisor_state-CADDY.txt
View file @
8d3ba8b8
T-0:bootstrap-monitor EXITED
T-0:certificate_authority-{hash}-on-watch RUNNING
T-0:crond-{hash} RUNNING
T-0:crond-{hash}
-on-watch
RUNNING
T-0:monitor-httpd-{hash}-on-watch RUNNING
T-0:monitor-httpd-graceful EXITED
T-1:caucase-updater-on-watch RUNNING
...
...
@@ -16,8 +16,7 @@ T-2:6tunnel-26011-{hash}-on-watch RUNNING
T-2:6tunnel-26012-{hash}-on-watch RUNNING
T-2:bootstrap-monitor EXITED
T-2:certificate_authority-{hash}-on-watch RUNNING
T-2:crond-{hash} RUNNING
T-2:crond-on-watch RUNNING
T-2:crond-{hash}-on-watch RUNNING
T-2:expose-csr_id-{hash}-on-watch RUNNING
T-2:frontend-caddy-safe-graceful EXITED
T-2:frontend-nginx-safe-graceful EXITED
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_supervisor_state-CADDY.txt
View file @
8d3ba8b8
T-0:bootstrap-monitor EXITED
T-0:certificate_authority-{hash}-on-watch RUNNING
T-0:crond-{hash} RUNNING
T-0:crond-{hash}
-on-watch
RUNNING
T-0:monitor-httpd-{hash}-on-watch RUNNING
T-0:monitor-httpd-graceful EXITED
T-1:caucase-updater-on-watch RUNNING
...
...
@@ -16,8 +16,7 @@ T-2:6tunnel-26011-{hash}-on-watch RUNNING
T-2:6tunnel-26012-{hash}-on-watch RUNNING
T-2:bootstrap-monitor EXITED
T-2:certificate_authority-{hash}-on-watch RUNNING
T-2:crond-{hash} RUNNING
T-2:crond-on-watch RUNNING
T-2:crond-{hash}-on-watch RUNNING
T-2:expose-csr_id-{hash}-on-watch RUNNING
T-2:frontend-caddy-safe-graceful EXITED
T-2:frontend-nginx-safe-graceful EXITED
...
...
This diff is collapsed.
Click to expand it.
stack/logrotate/buildout.hash.cfg
View file @
8d3ba8b8
...
...
@@ -22,4 +22,4 @@ md5sum = 117e46af6d9d31c09eeb86089d11407e
[template-logrotate-base]
filename = instance-logrotate-base.cfg.in
md5sum =
e2aec5faa92f1c9f4b436eae1a3e6881
md5sum =
338be3ee006c08b26abcc023f398247e
This diff is collapsed.
Click to expand it.
stack/logrotate/instance-logrotate-base.cfg.in
View file @
8d3ba8b8
...
...
@@ -46,11 +46,12 @@ context =
# User may override keys:
# - "post" with commands to execute after rotation
# - "pre" with commands to execute before rotation
# - "backup" with directory where to store logs
recipe = slapos.recipe.template:jinja2
template = {{ logrotate_entry_template }}
rendered = ${logrotate-conf-parameter:logrotate-entries}/${:name}
context =
key backup
logrotate-directory:logrotate-
backup
key backup
:
backup
key log :log
key post :post
key pre :pre
...
...
@@ -61,6 +62,7 @@ post =
pre =
frequency = daily
rotate-num = 3650
backup = ${logrotate-directory:logrotate-backup}
nocompress =
[logrotate]
...
...
This diff is collapsed.
Click to expand it.
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