robin/haze
1
0
Fork 0
mirror of https://codeberg.org/icewind/haze.git synced 2026-06-04 09:34:08 +02:00
Code Issues Projects Releases Wiki Activity

more office wip, only wss proxy missing it seems

Browse source
This commit is contained in:
Robin Appelman 2023-02-13 17:37:38 +01:00
commit 2a7f4de2b7
11 changed files with 186 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/service/office.rs
View file

@ -26,16 +26,34 @@ impl ServiceTrait for Office {
docker: &Docker,
cloud_id: &str,
network: &str,
_config: &HazeConfig,
config: &HazeConfig,
) -> Result<String> {
let image = "collabora/code";
pull_image(docker, image).await?;
let container_id = self.container_name(cloud_id);
let options = Some(CreateContainerOptions {
name: self.container_name(cloud_id),
name: container_id.clone(),
});
let mut env = vec!["extra_params=--o:ssl.enable=false --o:ssl.termination=true"];
let clean_id = container_id.strip_prefix("haze-").unwrap_or(&container_id);
let server_name_opt = match (&config.proxy.address, config.proxy.https) {
(public, true) if !public.is_empty() => {
format!("server_name={clean_id}.{public}")
}
(public, false) if !public.is_empty() => {
format!("server_name={clean_id}.{public}")
}
_ => "".to_string(),
};
if !server_name_opt.is_empty() {
env.push(&server_name_opt);
}
let config = Config {
image: Some(image),
env: Some(vec!["extra_params=--o:ssl.enable=false"]),
env: Some(env),
host_config: Some(HostConfig {
network_mode: Some(network.to_string()),
..Default::default()
@ -74,9 +92,15 @@ impl ServiceTrait for Office {
&["richdocuments"]
}
async fn post_setup(&self, docker: &Docker, cloud_id: &str) -> Result<Vec<String>> {
async fn post_setup(
&self,
docker: &Docker,
cloud_id: &str,
config: &HazeConfig,
) -> Result<Vec<String>> {
let container = &self.container_name(cloud_id);
let info = docker
.inspect_container(&self.container_name(cloud_id), None)
.inspect_container(container, None)
.await
.into_diagnostic()?;
let ip = if matches!(
@ -96,6 +120,8 @@ impl ServiceTrait for Office {
.ip_address
.clone()
.unwrap()
.parse()
.into_diagnostic()?
} else {
return Err(Report::msg("office not started"));
};
@ -105,8 +131,8 @@ impl ServiceTrait for Office {
ip
),
format!(
r#"occ config:app:set richdocuments public_wopi_url --value="http://{}:9980""#,
ip
r#"occ config:app:set richdocuments public_wopi_url --value="{}""#,
config.proxy.addr_with_port(container, ip, 9980)
),
format!(
r#"occ config:app:set richdocuments wopi_root --value="http://{}""#,