Skip to content

add new config switched for the global scale architecture - #5084

Merged
schiessle merged 1 commit into
masterfrom
useful-gs-settings
Jun 2, 2017
Merged

add new config switched for the global scale architecture#5084
schiessle merged 1 commit into
masterfrom
useful-gs-settings

Conversation

@schiessle

@schiessleschiessle commented May 24, 2017

Copy link
Copy Markdown
Member

Introduce two config switches:

  • gs.enabled, default is false, if it is set to true the server runs in a global scale setup
  • 'gs.federation', default is 'internal'. This means that federation is only used within the global scale setup. If you run a global scale setup and want to allow federation with outside you need to set it to 'global'

Rationals:

  • in a global scale setup it doesn't make sense to let user update the lookup server or to verify their accounts. The lookup server will be maintained by the admin.
  • It makes sense to restrict federation to the internal nodes of a global scale architecture by default.

cc @MorrisJobke@oparoz

@schiessleschiessle added the 2. developing Work in progress label May 24, 2017
@schiessleschiessle added this to the Nextcloud 12.0.1 milestone May 24, 2017
@mention-bot

Copy link
Copy Markdown

@schiessle, thanks for your PR! By analyzing the history of the files in this pull request, we identified @MorrisJobke, @j-ed and @LukasReschke to be potential reviewers.

@codecov

codecovBot commented May 24, 2017

Copy link
Copy Markdown

Codecov Report

Merging #5084 into master will decrease coverage by 22.85%.
The diff coverage is 40.54%.

@@ Coverage Diff @@## master #5084 +/- ##
=============================================
- Coverage 54.15% 31.29% -22.86% - Complexity 22286 22293 +7 
=============================================
Files 1379 1380 +1 Lines 85338 84780 -558 Branches 1322 1322 =============================================
- Hits 46214 26532 -19682 - Misses 39124 58248 +19124
Impacted FilesCoverage ΔComplexity Δ
.../federatedfilesharing/templates/settings-admin.php0% <ø> (ø)0 <0> (ø)⬇️
apps/federatedfilesharing/settings-personal.php0% <ø> (ø)0 <0> (ø)⬇️
settings/personal.php0% <0%> (ø)0 <0> (ø)⬇️
config/config.sample.php0% <0%> (ø)0 <0> (ø)⬇️
...ederatedfilesharing/lib/FederatedShareProvider.php0% <0%> (-66.26%)84 <0> (+4)
...s/federatedfilesharing/lib/AppInfo/Application.php0% <0%> (-93.55%)6 <0> (ø)
lib/private/Share20/ProviderFactory.php0% <0%> (-84.62%)29 <0> (ø)
apps/federatedfilesharing/lib/Settings/Admin.php87.5% <100%> (+1.78%)4 <1> (ø)⬇️
lib/private/GlobalScale/Config.php100% <100%> (ø)4 <4> (?)
...e/AppFramework/DependencyInjection/DIContainer.php67.32% <100%> (-17.77%)25 <0> (ø)
... and 375 more

@schiessle
schiessleforce-pushed the useful-gs-settings branch from d81d694 to 5a5b7abCompareMay 26, 2017 09:23
@schiessleschiessle added 3. to review Waiting for reviews and removed 2. developing Work in progress labels May 26, 2017
@schiessle

Copy link
Copy Markdown
MemberAuthor

@MorrisJobke@oparoz please test and review if this matches your expectation regarding the personal page and the admin settings.

@schiessle
schiessleforce-pushed the useful-gs-settings branch 2 times, most recently from 51e79f1 to c685b6fCompareMay 26, 2017 10:21
@oparoz
oparoz requested a review from ArtificialOwlMay 27, 2017 08:05
@MorrisJobke

Copy link
Copy Markdown
Member

@MorrisJobke@oparoz please test and review if this matches your expectation regarding the personal page and the admin settings.

Earliest in 1 week, but what you described sounded good.

@ArtificialOwl

ArtificialOwl commented May 29, 2017

Copy link
Copy Markdown
Member

I have a strange issue when switching to your branch:

Downgrading is not supported and is likely to cause unpredictable issues (from 13.0.0.0 to 12.0.0.28)

@schiessle
schiessleforce-pushed the useful-gs-settings branch from c685b6f to 337262bCompareMay 29, 2017 13:30
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
@schiessle
schiessleforce-pushed the useful-gs-settings branch from 337262b to 7c2d473CompareMay 29, 2017 16:19
@schiessle

Copy link
Copy Markdown
MemberAuthor

Tests passed... ready for final review 😃

@schiessle

Copy link
Copy Markdown
MemberAuthor

since @daita told me that he tested it successfully I will count this as the second positive review and merge it...

@schiessle
schiessle merged commit 74fccf2 into masterJun 2, 2017
@schiessle
schiessle deleted the useful-gs-settings branch June 2, 2017 08:58
@blizzzblizzz mentioned this pull request Jun 2, 2017
@blizzz

Copy link
Copy Markdown
Member

One thing that should be documented, otherwise its confusing for admins:

lookupServerEnabled and lookupServerUploadEnabled are ignored when GS is enabled.

incoming_server2server_share_enabled and outgoing_server2server_share_enabled are only ignored if GS is internal mode.

@MorrisJobke

Copy link
Copy Markdown
Member

@schiessle when I set following:

	'gs.enabled' => true,
'gs.federation' => 'internal',

What else happens beside that the input fields on the personal page are gone?

blizzz added a commit that referenced this pull request Jun 16, 2017
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
blizzz added a commit that referenced this pull request Jun 23, 2017
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@schiessle@mention-bot@MorrisJobke@ArtificialOwl@blizzz@nickvergessen