plugin app manager: rename sat to libervia
This commit is contained in:
parent
620f89f589
commit
7b58403a3a
3 changed files with 46 additions and 46 deletions
|
|
@ -0,0 +1,37 @@
|
|||
type: docker-compose
|
||||
prepare:
|
||||
git: https://github.com/WeblateOrg/docker-compose.git
|
||||
files:
|
||||
settings-override.py:
|
||||
content: |
|
||||
USE_X_FORWARDED_HOST = True
|
||||
override:
|
||||
version: "3"
|
||||
services:
|
||||
weblate:
|
||||
ports:
|
||||
- "8080"
|
||||
environment:
|
||||
WEBLATE_DEBUG: 0
|
||||
WEBLATE_URL_PREFIX: !libervia_param [url_prefix, /weblate]
|
||||
WEBLATE_EMAIL_HOST: !libervia_conf ["", "email_server"]
|
||||
WEBLATE_EMAIL_HOST_USER: !libervia_conf ["", "email_username"]
|
||||
WEBLATE_EMAIL_HOST_PASSWORD: !libervia_conf ["", "email_password"]
|
||||
WEBLATE_SERVER_EMAIL: !libervia_conf ["", "email_from", "weblate@example.com"]
|
||||
WEBLATE_DEFAULT_FROM_EMAIL: !libervia_conf ["", "email_from", "weblate@example.com"]
|
||||
WEBLATE_SITE_DOMAIN: !libervia_conf ["", "public_url"]
|
||||
WEBLATE_ADMIN_PASSWORD: !libervia_generate_pwd
|
||||
WEBLATE_ADMIN_EMAIL: !libervia_conf ["", "email_admins_list", "", "first"]
|
||||
WEBLATE_ENABLE_HTTPS: !libervia_conf ["", "weblate_enable_https", "1"]
|
||||
volumes:
|
||||
- ./settings-override.py:/app/data/settings-override.py:ro
|
||||
expose:
|
||||
url_prefix: [override, services, weblate, environment, WEBLATE_URL_PREFIX]
|
||||
front_url: !libervia_param [front_url, /translate]
|
||||
web_label: Translate
|
||||
ports:
|
||||
web:
|
||||
service: weblate
|
||||
private: 8080
|
||||
passwords:
|
||||
admin: [override, services, weblate, environment, WEBLATE_ADMIN_PASSWORD]
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
type: docker-compose
|
||||
prepare:
|
||||
git: https://github.com/WeblateOrg/docker-compose.git
|
||||
files:
|
||||
settings-override.py:
|
||||
content: |
|
||||
USE_X_FORWARDED_HOST = True
|
||||
override:
|
||||
version: "3"
|
||||
services:
|
||||
weblate:
|
||||
ports:
|
||||
- "8080"
|
||||
environment:
|
||||
WEBLATE_DEBUG: 0
|
||||
WEBLATE_URL_PREFIX: !sat_param [url_prefix, /weblate]
|
||||
WEBLATE_EMAIL_HOST: !sat_conf ["", "email_server"]
|
||||
WEBLATE_EMAIL_HOST_USER: !sat_conf ["", "email_username"]
|
||||
WEBLATE_EMAIL_HOST_PASSWORD: !sat_conf ["", "email_password"]
|
||||
WEBLATE_SERVER_EMAIL: !sat_conf ["", "email_from", "weblate@example.com"]
|
||||
WEBLATE_DEFAULT_FROM_EMAIL: !sat_conf ["", "email_from", "weblate@example.com"]
|
||||
WEBLATE_SITE_DOMAIN: !sat_conf ["", "public_url"]
|
||||
WEBLATE_ADMIN_PASSWORD: !sat_generate_pwd
|
||||
WEBLATE_ADMIN_EMAIL: !sat_conf ["", "email_admins_list", "", "first"]
|
||||
WEBLATE_ENABLE_HTTPS: !sat_conf ["", "weblate_enable_https", "1"]
|
||||
volumes:
|
||||
- ./settings-override.py:/app/data/settings-override.py:ro
|
||||
expose:
|
||||
url_prefix: [override, services, weblate, environment, WEBLATE_URL_PREFIX]
|
||||
front_url: !sat_param [front_url, /translate]
|
||||
web_label: Translate
|
||||
ports:
|
||||
web:
|
||||
service: weblate
|
||||
private: 8080
|
||||
passwords:
|
||||
admin: [override, services, weblate, environment, WEBLATE_ADMIN_PASSWORD]
|
||||
|
|
@ -69,7 +69,7 @@ software management tools.
|
|||
"""),
|
||||
}
|
||||
|
||||
APP_FILE_PREFIX = "sat_app_"
|
||||
APP_FILE_PREFIX = "libervia_app_"
|
||||
|
||||
|
||||
class AppManager:
|
||||
|
|
@ -126,11 +126,11 @@ class AppManager:
|
|||
"application_error", ".plugin", signature="sss"
|
||||
)
|
||||
yaml.add_constructor(
|
||||
"!sat_conf", self._sat_conf_constr, Loader=Loader)
|
||||
"!libervia_conf", self._libervia_conf_constr, Loader=Loader)
|
||||
yaml.add_constructor(
|
||||
"!sat_generate_pwd", self._sat_generate_pwd_constr, Loader=Loader)
|
||||
"!libervia_generate_pwd", self._libervia_generate_pwd_constr, Loader=Loader)
|
||||
yaml.add_constructor(
|
||||
"!sat_param", self._sat_param_constr, Loader=Loader)
|
||||
"!libervia_param", self._libervia_param_constr, Loader=Loader)
|
||||
|
||||
def unload(self):
|
||||
log.debug("unloading applications manager")
|
||||
|
|
@ -142,7 +142,7 @@ class AppManager:
|
|||
f"cleaning temporary directory at {data['_instance_dir_path']}")
|
||||
data['_instance_dir_obj'].cleanup()
|
||||
|
||||
def _sat_conf_constr(self, loader, node):
|
||||
def _libervia_conf_constr(self, loader, node):
|
||||
"""Get a value from Libervia configuration
|
||||
|
||||
A list is expected with either "name" of a config parameter, a one or more of
|
||||
|
|
@ -165,7 +165,7 @@ class AppManager:
|
|||
section, name, default, filter_ = config_data
|
||||
else:
|
||||
raise ValueError(
|
||||
f"invalid !sat_conf value ({config_data!r}), a list of 1 to 4 items is "
|
||||
f"invalid !libervia_conf value ({config_data!r}), a list of 1 to 4 items is "
|
||||
"expected"
|
||||
)
|
||||
|
||||
|
|
@ -193,11 +193,11 @@ class AppManager:
|
|||
|
||||
return value
|
||||
|
||||
def _sat_generate_pwd_constr(self, loader, node):
|
||||
def _libervia_generate_pwd_constr(self, loader, node):
|
||||
alphabet = string.ascii_letters + string.digits
|
||||
return ''.join(secrets.choice(alphabet) for i in range(30))
|
||||
|
||||
def _sat_param_constr(self, loader, node):
|
||||
def _libervia_param_constr(self, loader, node):
|
||||
"""Get a parameter specified when starting the application
|
||||
|
||||
The value can be either the name of the parameter to get, or a list as
|
||||
|
|
@ -414,7 +414,7 @@ class AppManager:
|
|||
cache_path.mkdir(0o700, parents=True, exist_ok=True)
|
||||
app_data['_instance_dir_path'] = cache_path
|
||||
else:
|
||||
dest_dir_obj = tempfile.TemporaryDirectory(prefix="sat_app_")
|
||||
dest_dir_obj = tempfile.TemporaryDirectory(prefix="libervia_app_")
|
||||
app_data['_instance_dir_obj'] = dest_dir_obj
|
||||
app_data['_instance_dir_path'] = Path(dest_dir_obj.name)
|
||||
instance_id = ret_data["instance"] = app_data['_instance_id'] = shortuuid.uuid()
|
||||
|
|
|
|||
Loading…
Reference in a new issue