Details

Reviewers

None

Group Reviewers

Restricted Project

Commits

rKe5c1e3164a83: Deployment configs
rK6466c085b948: Deployment configs
rKc1fa63a92ddd: Deployment configs
rK2451fd52dae3: Deployment configs
rK706bd341b2e4: Deployment configs
rKecafb7bf215d: Deployment configs

Summary

A bin/configure script copies everything deployment specific in the right locations.

Notes

We copy because symlinks don't work in docker containers where we sometimes only mount src/
Artisan commands + config could be included, but aren't atm.
The theme can be included via config/theme
The provided config works for the docker-compose localhost setup, I have another config for a localhost development setup via 127.0.0.1 where kolab4 runs on the host.
Most migrations where relatively straightforward to separate between seed/and regular migration, only 2022_05_13_100000_permissions_and_room_subscriptions.php was a bit more involved because it changes the schema, migrates existing data over, and then drops the old data. This is now solved by first running a seed-migration that create the new seed entry (deployment specific), and then run the schema change that generically moves existing data over.

Diff Detail

Repository

rK kolab

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 40427
Build 16352: arc lint + arc unit

Event Timeline

mollekopf requested review of this revision.Oct 11 2022, 12:07 AM

mollekopf created this revision.

Harbormaster completed remote builds in B40280: Diff 11084.Oct 11 2022, 12:07 AM

Fixed production seeder

Harbormaster completed remote builds in B40283: Diff 11090.Oct 11 2022, 12:10 AM

Removed production seeder

Harbormaster completed remote builds in B40286: Diff 11093.Oct 11 2022, 12:16 AM

mollekopf added a reviewer: Restricted Project.Oct 11 2022, 12:18 AM

mollekopf edited the summary of this revision. (Show Details)Oct 11 2022, 12:22 AM

mollekopf added a project: Restricted Project.

mollekopf edited the summary of this revision. (Show Details)Oct 11 2022, 12:26 AM

Cleanup

Harbormaster completed remote builds in B40292: Diff 11099.Oct 11 2022, 12:32 AM

Deployment configs as a filesystem overlay

The configure.sh script does what .s2i/bin/assemble does, in that it copies the overlay over the repository.
For the default setup we provide config.local, for a production environment we use one of our theme repositories (after resturcturing like we did for kolabnow).

Harbormaster completed remote builds in B40427: Diff 11165.Oct 19 2022, 10:41 AM

This migration thing is a mess and will be problematic in the future. I however have no better idea. We'll have to be very careful in the future. And this makes managing Kolab4 installation (and updates), if you are not Apheleia IT, very difficult.

I have one point that would have to be verified. You created some new migration files. Won't they all be executed when we deploy this change? I'm afraid they will, because the system will not find them in the migrations table, even though they have an old timestamp in the filename.

Specifically the problem might be with src/database/migrations/2022_05_13_090000_permissions_and_room_subscriptions.php. It probably should check if the SKUs already exist and not try to add them again if so. There's another problem with this migration file. It is not self-contained, i.e. it does not remove 'meet' SKU in up(), but does add it in down().

In D3902#47042, @machniak wrote:

This migration thing is a mess and will be problematic in the future. I however have no better idea. We'll have to be very careful in the future. And this makes managing Kolab4 installation (and updates), if you are not Apheleia IT, very difficult.

I don't disagree ;-)

I have one point that would have to be verified. You created some new migration files. Won't they all be executed when we deploy this change? I'm afraid they will, because the system will not find them in the migrations table, even though they have an old timestamp in the filename.

I think you are correct, we either need to keep the old names or make sure no harm is done by running the migration again.

Specifically the problem might be with src/database/migrations/2022_05_13_090000_permissions_and_room_subscriptions.php. It probably should check if the SKUs already exist and not try to add them again if so. There's another problem with this migration file. It is not self-contained, i.e. it does not remove 'meet' SKU in up(), but does add it in down().

In D3902#47162, @mollekopf wrote:

In D3902#47042, @machniak wrote:

Specifically the problem might be with src/database/migrations/2022_05_13_090000_permissions_and_room_subscriptions.php. It probably should check if the SKUs already exist and not try to add them again if so. There's another problem with this migration file. It is not self-contained, i.e. it does not remove 'meet' SKU in up(), but does add it in down().

This should actually be fine.

2022_05_13_090000_permissions_and_room_subscriptions is part of the "local" config, and as such will not be deployed to kolabnow.
The problematic part is here: https://bifrost.kolabsystems.com/D3235, I suppose there we should simply remove those migrations as they serve no purpose there.

Stripping all the secrets will require some additional setup-procedure to generate them, so I'm not going to do that in this patch. The situation has not actually gotten worse because I just concatenated src/env.example and ansible/env.local into ansible/env.

Cleaned up .env files & follow symbolic links in configure.sh

Harbormaster completed remote builds in B40481: Diff 11231.Nov 4 2022, 3:42 PM

This revision was not accepted when it landed; it landed in state Needs Review.Nov 16 2022, 4:27 PM

Closed by commit rKe5c1e3164a83: Deployment configs (authored by mollekopf). · Explain Why

This revision was automatically updated to reflect the committed changes.

Deployment configsClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 11165

ansible/env

ansible/env.local

ansible/setup.yml

bin/configure.sh

bin/quickstart.sh

ci/Makefile

ci/env.local

config.local/src/.env

config.local/src/database/migrations/2021_01_26_150000_change_sku_descriptions.php

config.local/src/database/migrations/2021_02_19_100000_transaction_amount_fix.php

config.local/src/database/migrations/2021_12_15_100000_rename_beta_skus.php

config.local/src/database/migrations/2022_05_13_090000_permissions_and_room_subscriptions.php

config.local/src/database/migrations/2022_07_08_100000_fix_group_sku_name.php

config.local/src/database/migrations/2022_09_08_100001_plans_free_months.php

config.local/src/database/seeds/DatabaseSeeder.php

config.local/src/database/seeds/DiscountSeeder.php

config.local/src/database/seeds/DomainSeeder.php

config.local/src/database/seeds/IP4NetSeeder.php

config.local/src/database/seeds/MeetRoomSeeder.php

config.local/src/database/seeds/OauthClientSeeder.php

config.local/src/database/seeds/PackageSeeder.php

config.local/src/database/seeds/PlanSeeder.php

config.local/src/database/seeds/PowerDNSSeeder.php

config.local/src/database/seeds/ResourceSeeder.php

config.local/src/database/seeds/SharedFolderSeeder.php

config.local/src/database/seeds/SkuSeeder.php

config.local/src/database/seeds/TenantSeeder.php

config.local/src/database/seeds/UserSeeder.php

config.localhost/src/.env

config.localhost/src/database

docker/tests/init.sh

src/.env.example

src/.gitignore

src/.s2i/bin/assemble

src/database/migrations/2021_01_26_150000_change_sku_descriptions.php

src/database/migrations/2021_02_19_100000_transaction_amount_fix.php

src/database/migrations/2021_04_08_150000_signup_code_headers.php

src/database/migrations/2021_07_12_100000_create_tenant_settings_table.php

src/database/migrations/2021_12_15_100000_rename_beta_skus.php

src/database/migrations/2022_05_13_100000_permissions_and_room_subscriptions.php

src/database/migrations/2022_07_08_100000_fix_group_sku_name.php

src/database/migrations/2022_09_08_100000_plans_free_months.php

src/database/seeds/DatabaseSeeder.php

src/database/seeds/local/DiscountSeeder.php

src/database/seeds/local/DomainSeeder.php

src/database/seeds/local/IP4NetSeeder.php

src/database/seeds/local/MeetRoomSeeder.php

src/database/seeds/local/OauthClientSeeder.php

src/database/seeds/local/PackageSeeder.php

src/database/seeds/local/PlanSeeder.php

src/database/seeds/local/PowerDNSSeeder.php

src/database/seeds/local/ResourceSeeder.php

src/database/seeds/local/SharedFolderSeeder.php

src/database/seeds/local/SkuSeeder.php

src/database/seeds/local/TenantSeeder.php

src/database/seeds/local/UserSeeder.php

src/database/seeds/production/DiscountSeeder.php

src/database/seeds/production/DomainSeeder.php

src/database/seeds/production/PackageSeeder.php

src/database/seeds/production/PlanSeeder.php

src/database/seeds/production/SkuSeeder.php

Deployment configs
ClosedPublic
Actions

Revision Contents
Changeset List