mirror of
				https://github.com/zokradonh/kopano-docker
				synced 2025-10-30 18:07:46 +00:00 
			
		
		
		
	Ease use of Owncloud Phoenix (#286)
* add tweak to serve phoenix from /files * auto enable oidc * simplify setup by adding root directly to kweb * add some descriptions for overriding kweb configuration * add some configuration and clean up
This commit is contained in:
		
							parent
							
								
									df6268e24f
								
							
						
					
					
						commit
						f94373903b
					
				
							
								
								
									
										1
									
								
								calendar/README.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								calendar/README.md
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1 @@ | |||||||
|  | # This is for the moment only for testing purposes | ||||||
| @ -2,7 +2,7 @@ version: "3.5" | |||||||
| services: | services: | ||||||
|   web: |   web: | ||||||
|     volumes: |     volumes: | ||||||
|       - ./web/kweb-calendar.cfg:/etc/kweb-extras/kweb-calendar.cfg |       - ./calendar/kweb-calendar.cfg:/etc/kweb-extras/kweb-calendar.cfg | ||||||
|       - ./kopano-calendar-0.20.0/:/usr/share/kopano-calendar/ |       - ./kopano-calendar-0.20.0/:/usr/share/kopano-calendar/ | ||||||
|       - ./kopano-calendar-0.20.0/config.json.in:/var/www/api/config/v1/kopano/calendar/config.json |       - ./kopano-calendar-0.20.0/config.json.in:/var/www/api/config/v1/kopano/calendar/config.json | ||||||
|   kopano_grapi: |   kopano_grapi: | ||||||
| @ -1,2 +1 @@ | |||||||
| staticpwa /calendar /usr/share/kopano-calendar/calendar-webapp | staticpwa /calendar /usr/share/kopano-calendar/calendar-webapp | ||||||
| root /var/www/ |  | ||||||
							
								
								
									
										9
									
								
								owncloud/99-oidc.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										9
									
								
								owncloud/99-oidc.sh
									
									
									
									
									
										Executable file
									
								
							| @ -0,0 +1,9 @@ | |||||||
|  | #!/usr/bin/env bash | ||||||
|  | 
 | ||||||
|  | echo "Configuring OIDC for kopano-docker" | ||||||
|  | 
 | ||||||
|  | set -x | ||||||
|  | 
 | ||||||
|  | occ app:enable openidconnect | ||||||
|  | 
 | ||||||
|  | true | ||||||
| @ -1,8 +1,16 @@ | |||||||
|  | # This is for the moment only for testing purposes. Starts owncloud with the phoenix ui (available from /files) and the owncloud openid component (not yet public). | ||||||
|  | # Both parts need to be extracted into the owncloud directory | ||||||
|  | # TODO when this is final, these parts should be part of the owncloud docker image (maybe just need to be enabled as apps) | ||||||
| version: "3.5" | version: "3.5" | ||||||
| services: | services: | ||||||
|   owncloud: |   owncloud: | ||||||
|     volumes: |     volumes: | ||||||
|  |       - ./owncloud/99-oidc.sh:/etc/owncloud.d/99-oidc.sh | ||||||
|       - ./owncloud/openidconnect/:/mnt/data/apps/openidconnect/ |       - ./owncloud/openidconnect/:/mnt/data/apps/openidconnect/ | ||||||
|       - ./owncloud/phoenix/:/mnt/data/apps/phoenix/ |  | ||||||
|       - ./owncloud/konnectd.config.php:/mnt/data/config/konnectd.config.php |       - ./owncloud/konnectd.config.php:/mnt/data/config/konnectd.config.php | ||||||
|  |       - ./owncloud/phoenix/:/mnt/data/apps/phoenix/ | ||||||
|       - ./owncloud/config.json:/mnt/data/apps/phoenix/config.json |       - ./owncloud/config.json:/mnt/data/apps/phoenix/config.json | ||||||
|  |   web: | ||||||
|  |     volumes: | ||||||
|  |       - ./owncloud/phoenix/:/var/www/files/ | ||||||
|  |       - ./owncloud/config.json:/var/www/files/config.json | ||||||
|  | |||||||
| @ -13,6 +13,10 @@ Example: | |||||||
| DEFAULTREDIRECT=/meet | DEFAULTREDIRECT=/meet | ||||||
| ``` | ``` | ||||||
| 
 | 
 | ||||||
|  | ## Serving additional files | ||||||
|  | 
 | ||||||
|  | Kweb in the Web container can easily be extended to serve static content. By default it will serve all content that has been copied into `/var/www/`. To extend the built in configuration file just add an additional file into `/etc/kweb-extras/`. Kweb is using the [Caddyfile syntax](https://caddyserver.com/v1/docs/caddyfile). | ||||||
|  | 
 | ||||||
| ## Information needed when not running your own reverse proxy | ## Information needed when not running your own reverse proxy | ||||||
| 
 | 
 | ||||||
| The `kopano_webapp` container is accessible on port 9080 and serves the WebApp on `/webapp`. | The `kopano_webapp` container is accessible on port 9080 and serves the WebApp on `/webapp`. | ||||||
| @ -19,6 +19,9 @@ | |||||||
| 		body   50MB | 		body   50MB | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | 	# serve static content from /var/www/ | ||||||
|  | 	root /var/www/ | ||||||
|  | 
 | ||||||
| 	redir 302 { | 	redir 302 { | ||||||
| 		if {path} is / | 		if {path} is / | ||||||
| 		/ {%DEFAULTREDIRECT%}/ | 		/ {%DEFAULTREDIRECT%}/ | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user