Bindata is optional and over-writable on restart #354

Merged
tboerger merged 13 commits from options-bindata into master 2016-12-22 18:12:24 +00:00
tboerger commented 2016-12-05 16:26:39 +00:00 (Migrated from github.com)

Generally it already works pretty good with or without the bindata build flag, but since I have also dropped the bindata for the app.ini I have to make sure that all required default attributes for the config are set. This currently not the case but feel free to review the rest of the PR until I can finish the configuration issue.

Generally it already works pretty good with or without the `bindata` build flag, but since I have also dropped the bindata for the `app.ini` I have to make sure that all required default attributes for the config are set. This currently not the case but feel free to review the rest of the PR until I can finish the configuration issue.
strk commented 2016-12-11 10:10:08 +00:00 (Migrated from github.com)

Was the conf/ -> options/ indispensable ? Files changed: 233 is a scary message for any reviewer

Was the `conf/` -> `options/` indispensable ? `Files changed: 233` is a scary message for any reviewer
bkcsoft commented 2016-12-12 22:30:28 +00:00 (Migrated from github.com)

@strk not really that hard to review ?
2016-12-12-232852_1916x1036_scrot

@strk not really that hard to review ? ![2016-12-12-232852_1916x1036_scrot](https://cloud.githubusercontent.com/assets/4726179/21119460/f38581e4-c0c2-11e6-9dca-4d911eb3c5e1.png)
bkcsoft commented 2016-12-22 08:57:47 +00:00 (Migrated from github.com)

LGTM

LGTM
andreynering commented 2016-12-22 12:09:17 +00:00 (Migrated from github.com)

Trusted LGTM

Trusted LGTM
tboerger commented 2016-12-22 12:26:14 +00:00 (Migrated from github.com)

Resolved conflicts.

Resolved conflicts.

How should I test this PR?

How should I test this PR?
tboerger commented 2016-12-22 17:25:41 +00:00 (Migrated from github.com)

Just checkout the PR and execute TAGS="bindata sqlite" make clean generate build && cp gitea ~/gitea, than switch the CLI into your home directory and execute ./giteaweb, this should result in that:

# ./gitea web
2016/12/22 18:23:06 [W] Custom config '/Users/thomas/custom/conf/app.ini' not found, ignore this if you're running first time
2016/12/22 18:23:06 [T] Custom path: /Users/thomas/custom
2016/12/22 18:23:06 [T] Log path: /Users/thomas/log
2016/12/22 18:23:06 [I] Gitea v0.9.99+467-g08e6ed0
2016/12/22 18:23:06 [I] Log Mode: Console(Trace)
2016/12/22 18:23:06 [I] Cache Service Enabled
2016/12/22 18:23:06 [I] Session Service Enabled
2016/12/22 18:23:06 [I] SQLite3 Supported
2016/12/22 18:23:06 [I] Run Mode: Development
2016/12/22 18:23:06 [I] Listen: http://0.0.0.0:3000
[Macaron] 2016-12-22 18:23:09: Started GET /install for [::1]
2016/12/22 18:23:09 [D] Session ID: 47b6b1ca45a04486
2016/12/22 18:23:09 [D] CSRF Token: aciiI_3qaSnUPF6wmjlm3hokcgc6MTQ4MjQyNzM4OTUxMzI4ODQzMA==
2016/12/22 18:23:09 [D] Template: install
[Macaron] 2016-12-22 18:23:09: Completed /install 200 OK in 54.47042ms
[Macaron] 2016-12-22 18:23:09: Started GET /img/favicon.png for [::1]
[Macaron] [Static] Serving /img/favicon.png
[Macaron] 2016-12-22 18:23:09: Completed /img/favicon.png 200 OK in 4.300748ms
Just checkout the PR and execute `TAGS="bindata sqlite" make clean generate build && cp gitea ~/gitea`, than switch the CLI into your home directory and execute `./giteaweb`, this should result in that: ``` # ./gitea web 2016/12/22 18:23:06 [W] Custom config '/Users/thomas/custom/conf/app.ini' not found, ignore this if you're running first time 2016/12/22 18:23:06 [T] Custom path: /Users/thomas/custom 2016/12/22 18:23:06 [T] Log path: /Users/thomas/log 2016/12/22 18:23:06 [I] Gitea v0.9.99+467-g08e6ed0 2016/12/22 18:23:06 [I] Log Mode: Console(Trace) 2016/12/22 18:23:06 [I] Cache Service Enabled 2016/12/22 18:23:06 [I] Session Service Enabled 2016/12/22 18:23:06 [I] SQLite3 Supported 2016/12/22 18:23:06 [I] Run Mode: Development 2016/12/22 18:23:06 [I] Listen: http://0.0.0.0:3000 [Macaron] 2016-12-22 18:23:09: Started GET /install for [::1] 2016/12/22 18:23:09 [D] Session ID: 47b6b1ca45a04486 2016/12/22 18:23:09 [D] CSRF Token: aciiI_3qaSnUPF6wmjlm3hokcgc6MTQ4MjQyNzM4OTUxMzI4ODQzMA== 2016/12/22 18:23:09 [D] Template: install [Macaron] 2016-12-22 18:23:09: Completed /install 200 OK in 54.47042ms [Macaron] 2016-12-22 18:23:09: Started GET /img/favicon.png for [::1] [Macaron] [Static] Serving /img/favicon.png [Macaron] 2016-12-22 18:23:09: Completed /img/favicon.png 200 OK in 4.300748ms ```
This repo is archived. You cannot comment on pull requests.
No reviewers
No Milestone
No project
No Assignees
1 Participants
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: lunny/gitea#354
No description provided.