Skip to content
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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 2 commits into from
Nov 26, 2017
Merged

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

merged 2 commits into from
Nov 26, 2017

Conversation

cez81
Copy link
Contributor

@cez81 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

@cez81 cez81 mentioned this pull request Apr 20, 2017
Closed
@lunny
Copy link
Member

lunny commented Apr 20, 2017

No. This will break all instances.

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 20, 2017
@cez81
Copy link
Contributor Author

cez81 commented Apr 20, 2017

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

@lunny
Copy link
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
Copy link
Contributor Author

cez81 commented Apr 21, 2017

Think it was changed in this PR #354

@strk
Copy link
Member

strk commented Apr 21, 2017

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

@cez81
Copy link
Contributor Author

cez81 commented Apr 25, 2017

Renamed to custom.sample instead.

@cez81 cez81 changed the title Rename app.ini > app.sample.ini Rename conf directory -> custom.sample Apr 25, 2017
@strk
Copy link
Member

strk commented Apr 26, 2017 via email

@cez81
Copy link
Contributor Author

cez81 commented Apr 26, 2017 •
edited
Loading

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

PR title is updated

@appleboy
Copy link
Member

LGTM

@tboerger tboerger added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 26, 2017
strk
strk suggested changes Apr 26, 2017
View reviewed changes
Copy link
Member

@strk strk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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..)

contrib/migrate/gogs_migrate.sh Outdated
@@ -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"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Contributor Author

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
Copy link
Member

strk commented Apr 26, 2017 via email

@cez81 cez81 mentioned this pull request Apr 26, 2017
Closed
7 tasks
@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
Copy link
Member

lunny commented Nov 20, 2017

need rebase.

@cez81
Copy link
Contributor Author

cez81 commented Nov 20, 2017

@lunny Rebase done

@codecov-io
Copy link

codecov-io commented Nov 20, 2017 •
edited
Loading

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
Copy link
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
Copy link
Member

@lunny makes much more sense.

@cez81 cez81 changed the title Rename conf directory -> custom.sample Move conf/app.ini -> custom/conf/app.ini.sample Nov 21, 2017
@lunny
Copy link
Member

lunny commented Nov 26, 2017

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

@tboerger tboerger added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Nov 26, 2017
@appleboy
Copy link
Member

@cez81 conflicts.

@cez81
Rename conf dir > custom.sample
0a2b477 
 * Explain app.ini purpose
@cez81
Copy link
Contributor Author

cez81 commented Nov 26, 2017

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

@strk
Copy link
Member

strk commented Nov 26, 2017

LGTM

strk
strk approved these changes Nov 26, 2017
View reviewed changes
Copy link
Member

@strk strk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good to me

@lafriks lafriks added the type/docs This PR mainly updates/creates documentation label Nov 26, 2017
@lunny lunny merged commit 7091db8 into go-gitea:master Nov 26, 2017
@cez81 cez81 deleted the rename_app.ini branch November 26, 2017 11:40
@cez81 cez81 mentioned this pull request Nov 26, 2017
Closed
@cez81 cez81 mentioned this pull request Nov 26, 2017
Merged
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@appleboy appleboy appleboy approved these changes

@strk strk strk approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/docs This PR mainly updates/creates documentation
Projects
None yet
Milestone
1.4.0
Development

Successfully merging this pull request may close these issues.
7 participants
@cez81 @lunny @strk @appleboy @codecov-io @tboerger @lafriks