New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move conf/app.ini -> custom/conf/app.ini.sample #1522

Merged
merged 2 commits into from Nov 26, 2017

Conversation

7 participants
@cez81
Contributor

cez81 commented Apr 20, 2017

Rename app.ini as it isn't actually used as config. It only serves to show default values.

Fix for #1432

@lunny

This comment has been minimized.

Member

lunny commented Apr 20, 2017

No. This will break all instances.

@cez81

This comment has been minimized.

Contributor

cez81 commented Apr 20, 2017

@lunny How? That's not what I have been told.

@lunny

This comment has been minimized.

Member

lunny commented Apr 21, 2017

Maybe you are right. It seems Gitea will not read app.ini but I haven't remember which PR did that.

@cez81

This comment has been minimized.

Contributor

cez81 commented Apr 21, 2017

Think it was changed in this PR #354

@strk

This comment has been minimized.

Member

strk commented Apr 21, 2017

How about renaming the conf/ directory to custom.sample/ instead ?

@cez81 cez81 force-pushed the cez81:rename_app.ini branch from e0be712 to 54efda1 Apr 25, 2017

@cez81

This comment has been minimized.

Contributor

cez81 commented Apr 25, 2017

Renamed to custom.sample instead.

@cez81 cez81 force-pushed the cez81:rename_app.ini branch from 54efda1 to c95241e Apr 25, 2017

@cez81 cez81 changed the title from Rename app.ini > app.sample.ini to Rename conf directory -> custom.sample Apr 25, 2017

@strk

This comment has been minimized.

Member

strk commented Apr 26, 2017

@cez81

This comment has been minimized.

Contributor

cez81 commented Apr 26, 2017

If you did in code please update the PR title too, so it's easier
to spot ?

PR title is updated

@appleboy

This comment has been minimized.

Member

appleboy commented Apr 26, 2017

LGTM

@tboerger tboerger added lgtm/need 1 and removed lgtm/need 2 labels Apr 26, 2017

@strk

Need to improve the gogs_migrate.sh to check specific gitea version being migrating to and ensuring to find the right corresponding app.ini (I'd prefer to fetch it locally..)

@@ -191,7 +191,7 @@ cp -R data "$gitea_path"
#mv $gitea_path/conf $gitea_path/options
cd "$gitea_path"
mv "custom/conf/app.ini" "custom/conf/gogs_app.ini"
url="https://raw.githubusercontent.com/go-gitea/gitea/v$gitea_version/conf/app.ini"
url="https://raw.githubusercontent.com/go-gitea/gitea/v$gitea_version/custom.sample/app.ini"

This comment has been minimized.

@strk

strk Apr 26, 2017

Member

This looks suspicious. BTW, I see gitea_version is hardcoded to 1.0.1 so this would basically not work as the 1.0.1 tag would not have custom.sample...

@cez81

This comment has been minimized.

Contributor

cez81 commented Apr 26, 2017

Need to improve the gogs_migrate.sh to check specific gitea version being migrating to and ensuring to find the right corresponding app.ini (I'd prefer to fetch it locally..)
Agree but is this even used nowadays? https://docs.gitea.io/en-us/upgrade-from-gogs/ doesn't mention it. it's hard-coded for version 1.0.1 but doesn't exist in v1.0 branch.

Maybe create another issue to update script if it's still used?

Ref: #532

@strk

This comment has been minimized.

Member

strk commented Apr 26, 2017

@cez81 cez81 force-pushed the cez81:rename_app.ini branch from 0b2378f to 4cf3a25 Apr 26, 2017

@cez81 cez81 referenced this pull request Apr 26, 2017

Closed

Update gogs_migrate.sh #1613

1 of 7 tasks complete

@lunny lunny added this to the 1.3.0 milestone Apr 30, 2017

@lafriks lafriks modified the milestones: 1.3.0, 1.4.0 Oct 25, 2017

@lunny

This comment has been minimized.

Member

lunny commented Nov 20, 2017

need rebase.

@cez81 cez81 force-pushed the cez81:rename_app.ini branch from 4cf3a25 to b384159 Nov 20, 2017

@cez81

This comment has been minimized.

Contributor

cez81 commented Nov 20, 2017

@lunny Rebase done

@cez81 cez81 force-pushed the cez81:rename_app.ini branch from b384159 to d2eba28 Nov 20, 2017

@codecov-io

This comment has been minimized.

codecov-io commented Nov 20, 2017

Codecov Report

Merging #1522 into master will increase coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1522      +/-   ##
==========================================
+ Coverage    26.8%   26.82%   +0.01%     
==========================================
  Files          90       90              
  Lines       17810    17810              
==========================================
+ Hits         4774     4777       +3     
+ Misses      12355    12353       -2     
+ Partials      681      680       -1
Impacted Files Coverage Δ
modules/process/manager.go 73.91% <0%> (+4.34%) ⬆️

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 716ac12...4e42262. Read the comment docs.

@lunny

This comment has been minimized.

Member

lunny commented Nov 21, 2017

How about to rename it to custom/conf/app.ini.sample so that user could find it easier?

@tboerger

This comment has been minimized.

Member

tboerger commented Nov 21, 2017

@lunny makes much more sense.

@cez81 cez81 force-pushed the cez81:rename_app.ini branch from d2eba28 to 4685525 Nov 21, 2017

@cez81 cez81 changed the title from Rename conf directory -> custom.sample to Move conf/app.ini -> custom/conf/app.ini.sample Nov 21, 2017

@lunny

This comment has been minimized.

Member

lunny commented Nov 26, 2017

Please resolve conflicts otherwise LGTM. @strk needs your approvals.

@tboerger tboerger added lgtm/done and removed lgtm/need 1 labels Nov 26, 2017

@appleboy

This comment has been minimized.

Member

appleboy commented Nov 26, 2017

@cez81 conflicts.

Rename conf dir > custom.sample
 * Explain app.ini purpose

@cez81 cez81 force-pushed the cez81:rename_app.ini branch from 4685525 to 0a2b477 Nov 26, 2017

@cez81

This comment has been minimized.

Contributor

cez81 commented Nov 26, 2017

@lunny, @appleboy PR rebased, now just need @strk approval

@strk

This comment has been minimized.

Member

strk commented Nov 26, 2017

LGTM

@strk

strk approved these changes Nov 26, 2017

All good to me

@lafriks lafriks added the kind/docs label Nov 26, 2017

@lunny lunny merged commit 7091db8 into go-gitea:master Nov 26, 2017

2 checks passed

approvals/lgtm this commit looks good
continuous-integration/drone/pr the build was successful
Details

@cez81 cez81 deleted the cez81:rename_app.ini branch Nov 26, 2017

cez81 added a commit to cez81/gitea that referenced this pull request Nov 26, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment