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

Add proxy support for Telegram alerts via curl #1901

Merged
merged 84 commits into from Jun 7, 2018

Conversation

3 participants
@lazymind
Contributor

lazymind commented May 17, 2018

I'm add a simple curl custom string for use curl with proxy in countries like Russia where Telegram has blocked.

UltimateByte and others added some commits Apr 15, 2018

Fixes validate function
appid var was set to an unset variable for unknown reason
Update _default.cfg
I'm add a simple curl custom string for use curl with proxy in countries like Russia where Telegram has blocked.
@UltimateByte

This comment has been minimized.

Collaborator

UltimateByte commented May 17, 2018

And you're only adding this to one game server?
And you're not using the variable anywhere?

@UltimateByte

This comment has been minimized.

Collaborator

UltimateByte commented May 17, 2018

Just saw your other PR.
No problem adding this.
Just gotta be added for other game servers as well.

@lazymind

This comment has been minimized.

Contributor

lazymind commented May 17, 2018

sorry I'm realy new on GitHub dev, it's my first try. I use only TS3Server, but i can add this tips to all game servers without any problems if you want, or, can you tell me, how i can add anything in all game servers cfg at one time?

@lazymind

This comment has been minimized.

Contributor

lazymind commented May 17, 2018

and sorry for my English, it's not so good. I'm from Russia.

@UltimateByte

This comment has been minimized.

Collaborator

UltimateByte commented May 17, 2018

No problem, that's cool you're trying it in the first place, this is a good idea to add.

I personally edit all files by hand when I'm doing this kind of things, that's longer but may main PC is on Windows so...
To add everything at once, you would need to work in Linux directly, you could pull the repo, edit all files for example using the sed command, then push back the changes to your repo lazymind:patch-1.

By the way, if you edit lazymind:patch-1, the new commits will be added to this pull-request. That is why you don't need to make two pull-requests.

@lazymind

This comment has been minimized.

Contributor

lazymind commented May 17, 2018

ok, nice.
This PR i made from web browser ))) So, i think it was a cause why i have a 2 PR.
I have a linux laptop on my work. i will try to do this tomorrow (because now 23:36 in Russia, and I realy need to go sleep).
Thank you very much for your help, it's very importatn for guys like me, who try do somthing on GitHub at first time.

Have a nice time, and see you later.

lazymind added some commits May 17, 2018

lazymind added some commits May 17, 2018

@lazymind lazymind changed the title from Update _default.cfg to Add proxy support for Telegram alerts via curl May 17, 2018

@lazymind

This comment has been minimized.

Contributor

lazymind commented May 17, 2018

And... it so happened that i can't sleep with some not compleated jobs...
So, i figured out with GitHub structure, and make necessary changes in all Games cfg's.
Now i think i can go to sleep and wait for confirmation or remarks to my changes.

Have a nice time 2 all.

@UltimateByte UltimateByte requested a review from dgibbs64 May 17, 2018

@UltimateByte

This comment has been minimized.

Collaborator

UltimateByte commented May 17, 2018

Haha, welcome to the club of people who can't sleep while something is pending! :p Not the best club though. ^^

Thanks for your work. I'll let @dgibbs64 check and merge this.
Just to let you know, only hotfixes are supposed to be PRed and merged directly into Master. Features should be added to the develop branch first. Though I'm pretty sure @dgibbs64 will be able to deal with it and commit to develop first, we will let you know if needed.

CF this: https://github.com/GameServerManagers/LinuxGSM/wiki/Branching
Don't hesitate reading the Developer section from the Wiki if you ever wish to get more involved into LinuxGSM developping. You can also ask on our Discord's developer section if you have any question.

Cheers 🍻

GitHub
LinuxGSM - Linux Game Server Managers_
@dgibbs64

This comment has been minimized.

Member

dgibbs64 commented Jun 7, 2018

@lazymind looking good. Thank you! Merging to develop

@dgibbs64 dgibbs64 changed the base branch from master to develop Jun 7, 2018

@dgibbs64

Happy with this!

@dgibbs64 dgibbs64 merged commit e26ce7d into GameServerManagers:develop Jun 7, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@wafflebot wafflebot bot removed the Status: dev queue label Jun 7, 2018

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