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
Titouan Soulard
slapos
Commits
4fa5e6e8
Commit
4fa5e6e8
authored
Aug 23, 2022
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Rename profiles
parent
c715a706
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
26 deletions
+26
-26
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+6
-6
software/caddy-frontend/instance-frontend.cfg.in
software/caddy-frontend/instance-frontend.cfg.in
+3
-3
software/caddy-frontend/instance-master.cfg.in
software/caddy-frontend/instance-master.cfg.in
+0
-0
software/caddy-frontend/instance.cfg.in
software/caddy-frontend/instance.cfg.in
+11
-11
software/caddy-frontend/software.cfg
software/caddy-frontend/software.cfg
+4
-4
software/caddy-frontend/test/test.py
software/caddy-frontend/test/test.py
+2
-2
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
4fa5e6e8
...
...
@@ -14,18 +14,18 @@
# not need these here).
[template]
filename = instance.cfg.in
md5sum =
f1f04e7f27bc6e40a655dd4badb2a8af
md5sum =
adacc6cedd88addedb75726f373ac493
[profile-common]
filename = instance-common.cfg.in
md5sum = 5784bea3bd608913769ff9a8afcccb68
[profile-
caddy-
frontend]
filename = instance-
apache-
frontend.cfg.in
md5sum =
75db32dd9b17c923b16420784dfba581
[profile-frontend]
filename = instance-frontend.cfg.in
md5sum =
daf5f53156d0339ca935c2913953e352
[profile-
caddy-replicate
]
filename = instance-
apache-replicate
.cfg.in
[profile-
master
]
filename = instance-
master
.cfg.in
md5sum = e7209d9c66fd30e1fa950d2d07957b95
[profile-slave-list]
...
...
software/caddy-frontend/instance-
apache-
frontend.cfg.in
→
software/caddy-frontend/instance-frontend.cfg.in
View file @
4fa5e6e8
...
...
@@ -11,7 +11,7 @@ parts =
logrotate-entry-caddy
caddy-frontend
caddyprofiledeps
switch-
caddy
-softwaretype
switch-
frontend
-softwaretype
caucase-updater
caucase-updater-promise
backend-client-caucase-updater
...
...
@@ -166,7 +166,7 @@ expose-csr-var = ${:var}/expose-csr
# slave introspection
slave-introspection-var = ${:var}/slave-introspection
[switch-
caddy
-softwaretype]
[switch-
frontend
-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = dynamic-custom-personal-profile-slave-list:output
RootSoftwareInstance = ${:default}
...
...
@@ -349,7 +349,7 @@ stop-on-error = True
< = jinja2-template-base
depends = ${caddyprofiledeps:recipe}
url = {{ software_parameter_dict['profile_slave_list'] }}
filename =
custom-personal-
instance-slave-list.cfg
filename = instance-slave-list.cfg
master_key_download_url = {{ dumps(slapparameter_dict['master-key-download-url']) }}
software_type = single-custom-personal
organization = {{ slapparameter_dict['cluster-identification'] }}
...
...
software/caddy-frontend/instance-
apache-replicate
.cfg.in
→
software/caddy-frontend/instance-
master
.cfg.in
View file @
4fa5e6e8
File moved
software/caddy-frontend/instance.cfg.in
View file @
4fa5e6e8
...
...
@@ -25,12 +25,12 @@ import-list =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = dynamic-profile-
caddy-replicate
:output
default = dynamic-profile-
master
:output
RootSoftwareInstance = ${:default}
custom-personal = dynamic-profile-
caddy-replicate
:output
single-default = dynamic-profile-
caddy-
frontend:output
single-custom-personal = dynamic-profile-
caddy-
frontend:output
replicate = dynamic-profile-
caddy-replicate
:output
custom-personal = dynamic-profile-
master
:output
single-default = dynamic-profile-frontend:output
single-custom-personal = dynamic-profile-frontend:output
replicate = dynamic-profile-
master
:output
kedifa = dynamic-profile-kedifa:output
[software-parameter-section]
...
...
@@ -38,19 +38,19 @@ kedifa = dynamic-profile-kedifa:output
{{ key }} = {{ dumps(value) }}
{% endfor -%}
[dynamic-profile-
caddy-
frontend]
[dynamic-profile-frontend]
< = jinja2-template-base
url = {{ software_parameter_dict['profile_
caddy_
frontend'] }}
filename = instance-
caddy-
frontend.cfg
url = {{ software_parameter_dict['profile_frontend'] }}
filename = instance-frontend.cfg
extra-context =
import furl_module furl
raw software_type single-custom-personal
[dynamic-profile-
caddy-replicate
]
[dynamic-profile-
master
]
< = jinja2-template-base
depends = ${caddyprofiledeps:recipe}
url = {{ software_parameter_dict['profile_
caddy_replicate
'] }}
filename = instance-
caddy-replicate
.cfg
url = {{ software_parameter_dict['profile_
master
'] }}
filename = instance-
master
.cfg
extra-context =
import subprocess_module subprocess
import functools_module functools
...
...
software/caddy-frontend/software.cfg
View file @
4fa5e6e8
...
...
@@ -71,8 +71,8 @@ context =
caucase_jinja2_library = ${caucase-jinja2-library:target}
# profiles
profile_
caddy_frontend = ${profile-caddy
-frontend:target}
profile_
caddy_replicate = ${profile-caddy-replicate
:target}
profile_
frontend = ${profile
-frontend:target}
profile_
master = ${profile-master
:target}
profile_common = ${profile-common:output}
profile_kedifa = ${profile-kedifa:target}
profile_logrotate_base = ${template-logrotate-base:output}
...
...
@@ -137,10 +137,10 @@ context =
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:filename}
[profile-
caddy-
frontend]
[profile-frontend]
<= download-profile
[profile-
caddy-replicate
]
[profile-
master
]
<= download-profile
[profile-kedifa]
...
...
software/caddy-frontend/test/test.py
View file @
4fa5e6e8
...
...
@@ -2181,7 +2181,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
def
test_server_polluted_keys_removed
(
self
):
buildout_file
=
os
.
path
.
join
(
self
.
getMasterPartitionPath
(),
'instance-
caddy-replicate
.cfg'
)
self
.
getMasterPartitionPath
(),
'instance-
master
.cfg'
)
with
open
(
buildout_file
)
as
fh
:
for
line
in
[
q
for
q
in
fh
.
readlines
()
...
...
@@ -4708,7 +4708,7 @@ class TestReplicateSlaveOtherDestroyed(SlaveHttpFrontendTestCase):
self
.
slap
.
waitForInstance
(
self
.
instance_max_retry
)
buildout_file
=
os
.
path
.
join
(
self
.
getMasterPartitionPath
(),
'instance-
caddy-replicate
.cfg'
)
self
.
getMasterPartitionPath
(),
'instance-
master
.cfg'
)
with
open
(
buildout_file
)
as
fh
:
buildout_file_content
=
fh
.
read
()
node_1_present
=
re
.
search
(
...
...
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