Add the apps-external directory during setup only by mmattel · Pull Request #34898 · owncloud/core

mmattel · 2019-03-26T13:44:41Z

Description

This PR adds the apps-external directory only during installation but not as before as part of the tar.
Relates to changes made in master Add per default the apps-external directory in config.php during installation #30889 and stable10 [stable10] Add per default the apps-external directory in config.php during installation #34656, both merged
Removing the changes made in Makefile,
Removing the physically created apps-external directory
Adopting the code in Setup.php

Related Issue

Fixes [Feature Request] make the apps-external folder default used in new installations #29839 (comment)
([Feature Request] make the apps-external folder default used in new installations)

Motivation and Context

Prevents re-adding that directory on every update.

How Has This Been Tested?

make test-php-unit TEST_DATABASE=mysql TEST_PHP_SUITE=tests/lib/SetupTest.php --> ok

Screenshots (if appropriate):

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Database schema changes (next release will require increase of minor version instead of patch)
Breaking change (fix or feature that would cause existing functionality to change)
Technical debt
Tests only (no source changes)

Checklist:

Code changes
Unit tests added
Acceptance tests added
Documentation ticket raised:

Open tasks:

Backport (if applicable set "backport-request" label and remove when the backport was done)

PVince81 · 2019-03-26T13:58:26Z

TEST: no op when folder exists and no write permissions
TEST: folder creates when not existing
TEST: error when no permission when attempting creation
TEST: created folder has write permissions

PVince81 · 2019-03-26T13:58:38Z

tested with occ maintenance:install ^

codecov · 2019-03-26T14:19:08Z

Codecov Report

Merging #34898 into master will decrease coverage by <.01%.
The diff coverage is 0%.

@@             Coverage Diff              @@
##             master   #34898      +/-   ##
============================================
- Coverage     65.35%   65.34%   -0.01%     
- Complexity    18488    18492       +4     
============================================
  Files          1208     1208              
  Lines         69975    69982       +7     
  Branches       1280     1280              
============================================
- Hits          45732    45730       -2     
- Misses        23871    23880       +9     
  Partials        372      372

Flag	Coverage Δ	Complexity Δ
#javascript	`53.04% <ø> (ø)`	`0 <ø> (ø)`	⬇️
#phpunit	`66.75% <0%> (-0.02%)`	`18492 <0> (+4)`

Impacted Files	Coverage Δ	Complexity Δ
lib/private/Setup.php	`24.89% <0%> (-0.78%)`	`57 <0> (+4)`
apps/files_trashbin/lib/Expiration.php	`96.55% <0%> (-1.73%)`	`29% <0%> (ø)`
lib/private/Server.php	`86.56% <0%> (-0.12%)`	`253% <0%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 67c4ba1...304aaf1. Read the comment docs.

mmattel · 2019-03-26T14:37:57Z

Command line installation - OK

sudo -uwww-data ./occ maintenance:install --database "mysql" --database-name "apptest" \
--database-host "localhost" --database-user "xyz" --database-pass "abc" \
--admin-user "admin" --admin-pass "def" 
ownCloud was successfully installed

apps-external directory got created

Making an existing apps-external owned by root (=no write access to www-data) - OK
Cleaning up the database and running the same installation command from above
Can't create or write into the apps-external directory /mnt/mm-klaus/www/owncloud/core-test/apps-external

PVince81 · 2019-03-26T14:47:37Z

forgot to say that in my setup the setup goes through but the folder "apps-external" doesn't get created, because the file_exists check is done on the data folder, not on "apps-external" and returns true, so it doesn't attempt to create it.

mmattel · 2019-03-26T14:50:23Z

I fixed the issue, tested it, squashed and pushed, see my test from above.

PVince81 · 2019-03-26T14:56:47Z

ah ok, didn't see the update. thanks

PVince81 · 2019-03-26T15:17:48Z

+
+		// create the apps-external directory only during installation
+		$appsExternalDir = \OC::$SERVERROOT.'/apps-external';
+		if (!\file_exists($appsExternalDir)) {


seems we already do is_dir for existence check and mkdir in the block below, so this one here feel redundant ?

I just did the same as we do for the data directory to stay inline.
I can of course drop the if statement and just do @mkdir. Just le me know.

ah ok, fine then. it only happens once at setup time, so not a big issue

PVince81

👍

PVince81 · 2019-03-26T15:55:38Z

@mmattel please backport

Backport of PR #34898

phil-davis · 2019-03-28T09:17:16Z

Backport stable10 #34902

mmattel added 3 - To Review backport-request labels Mar 26, 2019

mmattel requested review from PVince81 and phil-davis March 26, 2019 13:44

mmattel mentioned this pull request Mar 26, 2019

Acceptance tests using pre-installed apps_paths #34657

Closed

3 tasks

PVince81 reviewed Mar 26, 2019

View reviewed changes

Comment thread lib/private/Setup.php Outdated

PVince81 reviewed Mar 26, 2019

View reviewed changes

Comment thread lib/private/Setup.php Outdated

PVince81 added this to the development milestone Mar 26, 2019

apps-external during setup only

304aaf1

mmattel force-pushed the apps_external_new branch from 01fb3f0 to 304aaf1 Compare March 26, 2019 14:21

PVince81 reviewed Mar 26, 2019

View reviewed changes

PVince81 approved these changes Mar 26, 2019

View reviewed changes

PVince81 merged commit 22190c9 into master Mar 26, 2019

delete-merged-branch Bot deleted the apps_external_new branch March 26, 2019 15:55

mmattel added a commit that referenced this pull request Mar 26, 2019

[stable10] [PR 34898] Add the apps-external directory during setup only

e10f7b7

Backport of PR #34898

mmattel mentioned this pull request Mar 26, 2019

[stable10] [PR 34898] Add the apps-external directory during setup only #34902

Merged

11 tasks

phil-davis removed the backport-request label Mar 28, 2019

individual-it mentioned this pull request Sep 4, 2019

app-external is not created on upgrade #36151

Closed

lock Bot locked as resolved and limited conversation to collaborators Mar 27, 2020

Uh oh!

Conversation

mmattel commented Mar 26, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

Checklist:

Open tasks:

Uh oh!

PVince81 commented Mar 26, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PVince81 commented Mar 26, 2019

Uh oh!

Uh oh!

Uh oh!

codecov Bot commented Mar 26, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

mmattel commented Mar 26, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PVince81 commented Mar 26, 2019

Uh oh!

mmattel commented Mar 26, 2019

Uh oh!

PVince81 commented Mar 26, 2019

Uh oh!

PVince81 Mar 26, 2019

Choose a reason for hiding this comment

Uh oh!

mmattel Mar 26, 2019

Choose a reason for hiding this comment

Uh oh!

PVince81 Mar 26, 2019

Choose a reason for hiding this comment

Uh oh!

PVince81 left a comment

Choose a reason for hiding this comment

Uh oh!

PVince81 commented Mar 26, 2019

Uh oh!

phil-davis commented Mar 28, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mmattel commented Mar 26, 2019 •

edited

Loading

PVince81 commented Mar 26, 2019 •

edited

Loading

codecov Bot commented Mar 26, 2019 •

edited

Loading

mmattel commented Mar 26, 2019 •

edited

Loading