diff --git a/Makefile b/Makefile index 17a4196..d33a0bf 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,8 @@ export VERSION BUILD_ROOT_PATH=$(shell pwd) environment: + git submodule update --init --recursive + cp custom/menu/* isard-sso/docker/api/src/ cp digitaldemocratic.conf isard-apps/.env echo "BUILD_ROOT_PATH=$(BUILD_ROOT_PATH)/isard-apps" >> isard-apps/.env cp isard-apps/.env isard-apps/docker/postgresql && \ @@ -22,6 +24,7 @@ environment: build: environment docker-compose -f isard-sso/docker-compose-parts/haproxy.yml \ + -f isard-sso/docker-compose-parts/api.yml \ -f isard-sso/docker-compose-parts/freeipa.yml \ -f isard-sso/docker-compose-parts/keycloak.yml \ -f isard-sso/docker-compose-parts/avatars.yml \ diff --git a/custom/menu/custom.yaml b/custom/menu/custom.yaml new file mode 100644 index 0000000..eac3067 --- /dev/null +++ b/custom/menu/custom.yaml @@ -0,0 +1,32 @@ +--- +background_login: /custom/img/background.png +colours: + background: "#F0F0F0" + primary: "#92AE01" + secondary: "#FFFFFF" +logo: /custom/img/logo.png +apps_external: +- href: https://myweb + icon: fa fa-university + name: Escola Web + shortname: web +- href: https://myvideos + icon: fa fa-youtube-play + name: Youtube + shortname: youtube +- href: https://mydictionary + icon: fa fa-book + name: Diccionari + shortname: diccionari +- href: http://meet.jit.si + icon: fa fa-video-camera + name: Reunions Jitsi + shortname: jitsi +- href: https://www.duckduckgo.com + icon: fa fa-search + name: Cercar + shortname: search +- href: https://www.openstreetmap.org + icon: fa fa-map-marker + name: Maps + shortname: maps diff --git a/custom/menu/system.yaml b/custom/menu/system.yaml new file mode 100644 index 0000000..226fd04 --- /dev/null +++ b/custom/menu/system.yaml @@ -0,0 +1,55 @@ +apps_internal: +- subdomain: nextcloud + href: / + icon: fa fa-cloud + name: Núvol + crear arxius + shortname: cloud +- subdomain: nextcloud + href: /apps/mail/setup + icon: fa fa-envelope-o + name: Correu + shortname: email +- subdomain: pad + href: / + icon: fa fa-file-text-o + name: Pads + shortname: pads +- subdomain: nextcloud + href: /apps/forms + icon: fa fa-check-square-o + name: Formularis + shortname: forms +- subdomain: nextcloud + href: /apps/polls + icon: fa fa-bar-chart + name: Enquestes + shortname: feedback +- subdomain: nextcloud + href: /apps/spreed + icon: fa fa-commenting-o + name: Xat + shortname: chat +- subdomain: nextcloud + href: /apps/calendar + icon: fa fa-calendar + name: Calendari + shortname: schedule +- subdomain: wp + href: /wp-login.php?saml_sso + icon: fa fa-rss + name: Webs + shortname: webs +- subdomain: nextcloud + href: /apps/bbb + icon: fa fa-video-camera + name: Reunions BBB + shortname: meets_bbb +- subdomain: nextcloud + href: /apps/photos + icon: fa fa-file-image-o + name: Fotos + shortname: photos +user: + account: /auth/realms/master/account + avatar: /auth/realms/master/avatar-provider + password: /auth/realms/master/password diff --git a/digitaldemocratic.conf.example b/digitaldemocratic.conf.example index f8fd708..d2e9c4c 100644 --- a/digitaldemocratic.conf.example +++ b/digitaldemocratic.conf.example @@ -1,5 +1,5 @@ ## GLOBALS - +TITLE="Digital Democratic" DOMAIN=mydomain.com LETSENCRYPT_DNS= LETSENCRYPT_EMAIL= diff --git a/isard-sso b/isard-sso index fa66b7c..d397a41 160000 --- a/isard-sso +++ b/isard-sso @@ -1 +1 @@ -Subproject commit fa66b7c37db18b24b293ec9cee2c2cbca9ac9691 +Subproject commit d397a41b17e1cf82eaa5241d6423a644d500ca5d