Skip to content

Commit

Permalink
Merge pull request #19 from ConductionNL/dev-robert_datamodels
Browse files Browse the repository at this point in the history
Documentation update and update from master
  • Loading branch information
rubenvdlinde authored Feb 7, 2020
2 parents fa1a05a + 235b7ff commit 406e207
Show file tree
Hide file tree
Showing 26 changed files with 5,143 additions and 642 deletions.
3 changes: 2 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ ORGANIZATION_UNIT_NAME=Common-Ground
# Documentation settings
##################################################

APP_DOMAIN=conduction.nl
# The subdomain for this component (should be www for applications)
APP_SUBDOMAIN=vtc
# The domains on wich you want to provide this component, the first wil be used as primary (or common in cert-manger terms)
APP_DOMAINS=["conduction.nl","zaakonline.nl","huwelijksplanner.online","common-ground.dev"]
APP_DEMO=vtc.zaakonline.nl
Expand Down
6 changes: 3 additions & 3 deletions INSTALLATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@ $ helm upgrade vtc-prod ./api/helm --kubeconfig="api/helm/kubeconfig.yaml" --nam

Or del if you want to delete an existing one
```CLI
$ helm del vtc-dev --purge --kubeconfig="api/helm/kubeconfig.yaml --namespace=dev"
$ helm del vtc-stag --purge --kubeconfig="api/helm/kubeconfig.yaml --namespace=stag"
$ helm del vtc-prod --purge --kubeconfig="api/helm/kubeconfig.yaml --namespace=prod"
$ helm del vtc-dev --purge --kubeconfig="api/helm/kubeconfig.yaml"
$ helm del vtc-stag --purge --kubeconfig="api/helm/kubeconfig.yaml"
$ helm del vtc-prod --purge --kubeconfig="kubeconfig.yaml"
```


Expand Down
30 changes: 15 additions & 15 deletions api/config/bundles.php
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?php

return [
Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
Symfony\Bundle\MercureBundle\MercureBundle::class => ['all' => true],
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
Nelmio\CorsBundle\NelmioCorsBundle::class => ['all' => true],
Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
Conduction\CommonGroundBundle\CommonGroundBundle::class => ['all' => true],
Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true],
Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
Symfony\Bundle\MercureBundle\MercureBundle::class => ['all' => true],
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
Nelmio\CorsBundle\NelmioCorsBundle::class => ['all' => true],
Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
Conduction\CommonGroundBundle\CommonGroundBundle::class => ['all' => true],
Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true],
Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['all' => true],
Tbbc\MoneyBundle\TbbcMoneyBundle::class => ['all' => true],
Knp\Bundle\MarkdownBundle\KnpMarkdownBundle::class => ['all' => true],
Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['all' => true],
Tbbc\MoneyBundle\TbbcMoneyBundle::class => ['all' => true],
Knp\Bundle\MarkdownBundle\KnpMarkdownBundle::class => ['all' => true],
];
6 changes: 3 additions & 3 deletions api/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ settings:
version: V.0.1
description: '&#039;Naast deze JSON rest API is er ook een [graphql](/graphql) interface beschikbaar.&#039;'
repro: 'https://github.com/ConductionNL/verzoektypecatalogus'
subdomain:
subdomain: vtc
domains:
- conduction.nl
- zaakonline.nl
Expand Down Expand Up @@ -48,7 +48,7 @@ settings:


php:
repository: docker.io/conduction/vtc-php
repository: docker.io/conduction/protocomponent-php
tag: latest
mercure:
jwtSecret: ""
Expand All @@ -64,7 +64,7 @@ nginx:
varnish:
enabled: true
#url: https://example.com
repository: docker.io/conduction/vtc-varnish
repository: docker.io/conduction/protocomponent-varnish
tag: latest
pullPolicy: Always
replicaCount: 1
Expand Down
Binary file added api/public/schema/Datamodel_Modelio.zip
Binary file not shown.
Binary file added api/public/schema/datamodel.pdf
Binary file not shown.
Loading

0 comments on commit 406e207

Please sign in to comment.