mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-25 14:30:28 -05:00
Code Issues Packages Projects Releases Wiki Activity
160 Commits 48 Branches 39 Tags
fb6bf5a2fa8bd48b60fe0ff70872a3d39d2ea634
Commit Graph

56 Commits

Author SHA1 Message Date
A.Unger
961da9b8f0 comment exported ParseConfig func 2020-03-18 13:02:28 +01:00
A.Unger
f737dd6aa6 parse configuration on before hook on server command 2020-03-18 12:54:46 +01:00
A.Unger
57d90d7fcf move vipoer config parsing to its scope 2020-03-18 12:54:31 +01:00
Jörn Friedrich Dreyer
6738304669 integrate with current ocis config 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
 2020-03-17 18:08:12 +01:00
Michael Barz
e8b9629460 Update phoenix to 0.6.0 2020-03-16 17:19:18 +01:00
Jörn Friedrich Dreyer
5a49176ed8 Update to phoenix v0.5.0 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
 2020-03-03 09:53:37 +01:00
A.Unger
6a247ebe0e override default config values when config file is present 2020-03-02 12:13:54 +01:00
Jörn Friedrich Dreyer
06f50c42c2 Update flagset.go (#42) 2020-02-13 21:44:18 +01:00
Ilja Neumann
575ed20626 Set ocis-konnect defaults 2020-02-13 21:17:30 +01:00
Jörn Friedrich Dreyer
cbd696c538 update ocis-pkg to v2.0.1 and micro/cli to v2 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
 2020-02-10 12:25:06 +01:00
Jörn Friedrich Dreyer
4eabdad540 Revert "update ocis-pkg to v2.0.1 and micro/cli to v2" 
This reverts commit 83c820e6a7.
 2020-02-10 12:22:42 +01:00
Jörn Friedrich Dreyer
83c820e6a7 update ocis-pkg to v2.0.1 and micro/cli to v2 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
 2020-02-10 12:17:03 +01:00
Thomas Müller
5390ca28ef In case the http server cannot be started the error is logged 2020-01-28 11:40:12 +01:00
A.Unger
1b73f3e7be rename flag to singular 2020-01-27 09:06:32 +01:00
A.Unger
8fc3593a75 Update micro alongside micro to v2, remove cli flags parsing monkeypatch for web-config-apps 2020-01-27 08:58:58 +01:00
David Christofas
0fabe3b0c4 fix: remove flagset options 
Flagsets are not necessary for initializing the web server/service.
Passing them will cause micro to call the flagset function again which
then overrides the given value with the default value.

Fixes #33
 2020-01-22 16:14:07 +01:00
Jörn Friedrich Dreyer
8a9fc2f33c files must be loaded before draw io 
related: https://github.com/owncloud/phoenix/issues/2891
 2020-01-17 14:46:33 +01:00
Jörn Friedrich Dreyer
85fc6ee2ec Merge branch 'master' into change-default-port-for-oidc-to-reva 2020-01-17 10:10:44 +01:00
Jörn Friedrich Dreyer
0ad66e074d add default apps 
files,pdf-viewer,markdown-editor,media-viewer work
draw-io seems broken
 2020-01-17 09:33:16 +01:00
Jörn Friedrich Dreyer
de59eb3111 change default port for oidc to reva idp 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
 2020-01-16 22:45:53 +01:00
A.Unger
761e114666 use ocis-pkg@master until a new release is out 2020-01-15 15:58:56 +01:00
A.Unger
534c8a715a move string flag parsing functionality over to ocis-pkg 2020-01-15 14:21:56 +01:00
A.Unger
e3e2e4127d added utils to flagset 2020-01-15 11:24:26 +01:00
A.Unger
a628356fe8 update usage for web-config-apps flag 2020-01-15 11:10:45 +01:00
A.Unger
4aa049ec5e remove unused variable 2020-01-15 11:05:18 +01:00
A.Unger
aa74f44b08 StringSlice flag to String, rename EnvVar to PHOENIX_WEB_CONFIG_APPS 2020-01-15 10:47:21 +01:00
Thomas Müller
1b82c81dcf Update to v0.2.7-alpha1 2020-01-14 16:00:12 +01:00
Jörn Friedrich Dreyer
ec66aaf029 Fix external_apps config 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
 2020-01-11 21:15:03 +01:00
Thomas Müller
819c7bec7b Merge pull request #23 from owncloud/feature/22 
Fixes #22 - update to phoenix 0.2.6
 2020-01-09 16:27:33 +01:00
Jörn Friedrich Dreyer
07e0a20d0d dynamically render config.json 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
 2020-01-09 15:50:27 +01:00
Thomas Müller
95d647b09b Fixes #22 - update to phoenix 0.2.6 2020-01-09 14:05:19 +01:00
A.Unger
4155720666 update refs to config.Phoenix.Namespace 2019-12-24 11:43:18 +01:00
A.Unger
69e594ace5 move namespace option under HTTP 2019-12-24 11:41:42 +01:00
A.Unger
5708f07a37 use value from config 2019-12-18 13:11:33 +01:00
A.Unger
b922327074 use http namespace 2019-12-18 12:58:02 +01:00
A.Unger
276aa69451 hardcode web 2019-12-18 12:51:28 +01:00
A.Unger
d6a80470f2 added namespace option 2019-12-18 12:51:09 +01:00
A.Unger
da729b6319 added http-namespace flag 2019-12-18 12:50:00 +01:00
A.Unger
1a00d102c4 inject cmd flags 2019-12-12 11:09:45 +01:00
Thomas Boerger
690e80aaec Add back http-root 2019-12-09 16:13:26 +01:00
Thomas Boerger
1aa4e64764 add logger to assets 2019-12-09 16:12:53 +01:00
Thomas Boerger
3498580b7b Restructure project similar to hello and graph 2019-12-09 16:12:53 +01:00
Thomas Boerger
c25c0324ee Add test file dummies 2019-09-20 09:23:05 +02:00
Thomas Boerger
f8343dd870 Rename phoenix folder into assets 2019-09-16 14:05:36 +02:00
Thomas Boerger
85b9383aa5 Merge branch 'master' into socket-listener 2019-09-13 14:48:55 +02:00
Thomas Boerger
def3c32bca Drop and ignore generated assets 
We are embedding the assets as part of our build pipeline, and even
without that the embedded assets are generated by our `make generate`
task anyway, so let's remove thise huge amount of files from the
repository and generate it on build time.
 2019-09-13 14:41:16 +02:00
Thomas Boerger
ae50f7dcd3 Optionally listen to unix sockets instead of port binding 2019-09-13 14:39:31 +02:00
Thomas Boerger
7eda1b62b0 Add missing dot to comment 2019-09-13 13:22:45 +02:00
Thomas Boerger
39de6f69e4 Drop all config attributes, just serve a config.json 2019-09-11 13:08:33 +02:00
Thomas Boerger
ebfc405449 Upgrade phoenix to 0.2.1 2019-09-06 14:53:11 +02:00