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.

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

Config #57

Merged
merged 8 commits into from
Sep 9, 2024
Merged

Config #57

merged 8 commits into from
Sep 9, 2024

Conversation

mikespub
Copy link
Contributor

@mikespub mikespub commented Sep 1, 2024

linuxserver.io


  • I have read the contributing guideline and understand that I have made the correct modifications

Description:

Add $config['cops_kepubify_path'] in root/defaults/config_local.php

Benefits of this PR and context:

Default configuration of kepubify path in line with previous Dockerfile change

How Has This Been Tested?

Create docker image and run

Source / References:

mikespub-org/seblucas-cops#77

@LinuxServer-CI
Copy link
Contributor

I am a bot, here are the test results for this PR:
https://ci-tests.linuxserver.io/lspipepr/cops/2.7.5-pkg-7c7d74ba-dev-8a6b616a4240ab814174cf4e58962dc8e7402f36-pr-57/index.html
https://ci-tests.linuxserver.io/lspipepr/cops/2.7.5-pkg-7c7d74ba-dev-8a6b616a4240ab814174cf4e58962dc8e7402f36-pr-57/shellcheck-result.xml

Tag Passed
amd64-2.7.5-pkg-7c7d74ba-dev-8a6b616a4240ab814174cf4e58962dc8e7402f36-pr-57
arm64v8-2.7.5-pkg-7c7d74ba-dev-8a6b616a4240ab814174cf4e58962dc8e7402f36-pr-57

@LinuxServer-CI
Copy link
Contributor

I am a bot, here are the test results for this PR:
https://ci-tests.linuxserver.io/lspipepr/cops/2.8.1-pkg-68c4e92d-dev-9769670e6ece640db7acc6b95ed83655ebae73eb-pr-57/index.html
https://ci-tests.linuxserver.io/lspipepr/cops/2.8.1-pkg-68c4e92d-dev-9769670e6ece640db7acc6b95ed83655ebae73eb-pr-57/shellcheck-result.xml

Tag Passed
amd64-2.8.1-pkg-68c4e92d-dev-9769670e6ece640db7acc6b95ed83655ebae73eb-pr-57
arm64v8-2.8.1-pkg-68c4e92d-dev-9769670e6ece640db7acc6b95ed83655ebae73eb-pr-57

@LinuxServer-CI
Copy link
Contributor

I am a bot, here are the test results for this PR:
https://ci-tests.linuxserver.io/lspipepr/cops/3.1.1-pkg-d408948f-dev-c5bc085bc03ed6cbbd82498506fece689d569673-pr-57/index.html
https://ci-tests.linuxserver.io/lspipepr/cops/3.1.1-pkg-d408948f-dev-c5bc085bc03ed6cbbd82498506fece689d569673-pr-57/shellcheck-result.xml

Tag Passed
amd64-3.1.1-pkg-d408948f-dev-c5bc085bc03ed6cbbd82498506fece689d569673-pr-57
arm64v8-3.1.1-pkg-d408948f-dev-c5bc085bc03ed6cbbd82498506fece689d569673-pr-57

@LinuxServer-CI
Copy link
Contributor

I am a bot, here are the test results for this PR:
https://ci-tests.linuxserver.io/lspipepr/cops/3.1.1-pkg-d408948f-dev-c40c2e4db473136242fcf10544c3e72919de9957-pr-57/index.html
https://ci-tests.linuxserver.io/lspipepr/cops/3.1.1-pkg-d408948f-dev-c40c2e4db473136242fcf10544c3e72919de9957-pr-57/shellcheck-result.xml

Tag Passed
amd64-3.1.1-pkg-d408948f-dev-c40c2e4db473136242fcf10544c3e72919de9957-pr-57
arm64v8-3.1.1-pkg-d408948f-dev-c40c2e4db473136242fcf10544c3e72919de9957-pr-57

@mikespub
Copy link
Contributor Author

mikespub commented Sep 9, 2024

Hi @aptalca & friends

I've updated this PR to include the config changes needed for COPS 3.x. Any chance this could be reviewed?

Thanks :-)
P.S.: if you have some good guidelines on how to adapt the nginx default.conf.sample file to make use of a front controller and get rid of index.php/ in URLs, I'd be happy to test it for COPS and submit another PR later

@aptalca
Copy link
Member

aptalca commented Sep 9, 2024

Thanks @mikespub

I did a quick review and it looks good.

But I'm also thinking we should do the migration of the config file automatically for existing users.

If you're planning on releasing v3 soon, we can temporarily pause our external checks, update this PR with the migration and after you release v3 we merge this PR and reenable external checks. Does that work?

@aptalca
Copy link
Member

aptalca commented Sep 9, 2024

On second thought, we could probably do the migration conditionally so we don't have to coordinate releases

@aptalca
Copy link
Member

aptalca commented Sep 9, 2024

Opened a PR mikespub-org#1

aptalca and others added 2 commits September 9, 2024 12:13
migrate config to v3 but leave old one in place just in case
@LinuxServer-CI
Copy link
Contributor

I am a bot, here are the test results for this PR:
https://ci-tests.linuxserver.io/lspipepr/cops/3.1.1-pkg-d408948f-dev-e7061aed628b200b22f9c3e4344eb1bff06491d1-pr-57/index.html
https://ci-tests.linuxserver.io/lspipepr/cops/3.1.1-pkg-d408948f-dev-e7061aed628b200b22f9c3e4344eb1bff06491d1-pr-57/shellcheck-result.xml

Tag Passed
amd64-3.1.1-pkg-d408948f-dev-e7061aed628b200b22f9c3e4344eb1bff06491d1-pr-57
arm64v8-3.1.1-pkg-d408948f-dev-e7061aed628b200b22f9c3e4344eb1bff06491d1-pr-57

@mikespub
Copy link
Contributor Author

mikespub commented Sep 9, 2024

Great, that PR looks fine to me - merged :-)

I did something similar in COPS itself for non-docker installations, but this should cover the docker version too - thanks @aptalca

@aptalca
Copy link
Member

aptalca commented Sep 9, 2024

I just noticed your release candidate is marked as latest in github releases so it's already building 3.1.1
And it looks like we already pushed a broken release as a result. Oops

The webpage seems to error out on a fresh container as seen in the test result above: https://ci-tests.linuxserver.io/lspipepr/cops/3.1.1-pkg-d408948f-dev-e7061aed628b200b22f9c3e4344eb1bff06491d1-pr-57/index.html

@mikespub
Copy link
Contributor Author

mikespub commented Sep 9, 2024

Actually COPS is now sending you to index.php/check instead of checkconfig.php - which is the output you see there. The docker part is fine, but the COPS part is not (quite) yet.

That's why I called this a release candidate rather than a release, to iron out these little issues. Once this docker-cops PR is merged and working, I can prepare a next release with bug fixes on the COPS side and it'll automatically go through the next time. But for that I needed the config file issue resolved first :-)

@aptalca aptalca requested a review from a team September 9, 2024 17:31
@aptalca aptalca merged commit 48374a7 into linuxserver:master Sep 9, 2024
5 checks passed
@mikespub
Copy link
Contributor Author

mikespub commented Sep 9, 2024

Thanks @aptalca - always a pleasure working with the linuxserver team...
You do great work, and we appreciate it even if we don't say it enough :-)

@mikespub mikespub deleted the config branch September 9, 2024 17:46
@aptalca
Copy link
Member

aptalca commented Sep 9, 2024

You guys are doing the actual work, we just try to keep up 😅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

3 participants