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

Created documentation for kustomization deployment #463

Merged
merged 9 commits into from
Nov 18, 2022

Conversation

l-maciej
Copy link
Contributor

@l-maciej l-maciej commented Nov 2, 2022

Initial commit for kustomization-based deployment.

@l-maciej l-maciej mentioned this pull request Nov 2, 2022
docs/install.md Outdated
@@ -185,8 +185,6 @@ ntfy is packaged in nixpkgs as `ntfy-sh`. It can be installed by adding the pack
nix-env -iA ntfy-sh
```

NixOS also supports [declarative setup of the ntfy server](https://search.nixos.org/options?channel=unstable&show=services.ntfy-sh.enable&from=0&size=50&sort=relevance&type=packages&query=ntfy).

Copy link
Owner

Choose a reason for hiding this comment

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

Your branch seems to be out of date. Pull the latest changes via git pull upstream main ("upstream" is the remote https://github.com/binwiederhier/ntfy, Google git remote add).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Line restored

@binwiederhier
Copy link
Owner

👍 Thank you for your PR. I left some comments, which you'd need to address before I can merge it. Usually I just merge it and then do the format fixes later, but the PR is too extensive to do that myself.

@binwiederhier
Copy link
Owner

Your branch is still not up-to-date, and you've change permissions on various files (see "Files" tab in this PR).

Do this to update your branch:

git remote add upstream git@github.com:binwiederhier/ntfy.git
git fetch upstream
git pull upstream main
git push origin main

You'll still need to revert the file permissions.

@binwiederhier
Copy link
Owner

Ping.

@Ali2731
Copy link

Ali2731 commented Nov 11, 2022

Your branch is still not up-to-date, and you've change permissions on various files (see "Files" tab in this PR).

Do this to update your branch:

git remote add upstream git@github.com:binwiederhier/ntfy.git
git fetch upstream
git pull upstream main
git push origin main
You'll still need to revert the file permissions.

@l-maciej
Copy link
Contributor Author

l-maciej commented Nov 11, 2022

Hi I've reverted permissions and pulled in fresh changes from the main branch.

@binwiederhier
Copy link
Owner

binwiederhier commented Nov 12, 2022

Almost there. If you look at the diff https://github.com/binwiederhier/ntfy/pull/463/files (see https://github.com/binwiederhier/ntfy/pull/463/files#diff-162b45a313f5f057a233411edbe31e72a13185f4df0ae0e1af2c13521bc05d5aL188), you'll see that the is a string that your PR removes that is entirely unrelated. That should be fixed by pulling from upstream as described above.

If you can't figure out how, I can do it :)

@binwiederhier binwiederhier merged commit b1819d4 into binwiederhier:main Nov 18, 2022
@binwiederhier
Copy link
Owner

Looks good. Thanks.

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

Successfully merging this pull request may close these issues.

3 participants