<VITAS> For registration we do. mx.52k 10.150.1.8 is the mail proxy
<VITAS> i think its port 125 for outgoing mails or whatever i set it to in the config?
<VITAS> have to check
<RockyTV> HebaruSan, I can rebase #133 and reopen the PR to target the correct branch
<HebaruSan> That would be excellent, and I'm sorry again about the inconvenience.
<HebaruSan> Oddly I was able to update the target branch for my own PR, so maybe GItHub only allows the creator to do that.
<RockyTV> how'd you do that?
<HebaruSan> It shows up if you edit the title
<VITAS> if it wakes up RockyTV to help out with patching code its the right kind of inconvinience ;)
<HebaruSan> So the Edit button at the upper right
<HebaruSan> Good morning VITAS
<RockyTV> try reopening #133
<VITAS> Gooooood morning vietnam!
<RockyTV> pardon me for my ignorance but is that a The Office reference? :P
<HebaruSan> The reopen button is disabled
<RockyTV> oh, "the dev branch has been deleted"
<RockyTV> rip
<HebaruSan> Really just renamed to dev-old, but as far as I could determine the way to do that in git is to create and delete
<RockyTV> so I cannot cherry pick my commit into alpha branch
<RockyTV> okay the problem is that the alpha branch is too old
<RockyTV> it still uses the KerbalStuff namespace
<HebaruSan> The alpha branch is the same as master, plus a commit or two
<RockyTV> apparently we still refer to KerbalStuff
<RockyTV> something's wrong
<RockyTV> I thought dev was supposed to be the current production code
<VITAS> if i could turn back time i would have removed those references when creating spacedock and i also would have moved the repo to my own git installation
<RockyTV> I'm confused
<RockyTV> left is alpha branch, right is my file size commit
<RockyTV> are you sure production's not running dev-old?
<VITAS> and?
<RockyTV> because that would be a pretty big rollback
<VITAS> yes it will with a bit of garnish
<RockyTV> if we're still using the KerbalStuff namespace
<VITAS> uhm
<VITAS> problem is that we have to unify the code somehow
<VITAS> HebaruSan, got a dump of the production code
<HebaruSan> Pass not the buck to me, that was your dump
<HebaruSan> As found on the sd2 server
<VITAS> so if he commited that its the real deal int erms of what is running on spacedock.info right now
<VITAS> so yes
<VITAS> we are running code missing a lot of commits
<HebaruSan> OK so maybe we should pull dev-old to master first
<VITAS> and im not blaming you for anything :)
<HebaruSan> If that in fact represents code that's already been developed and tested and reviewed
<HebaruSan> Sorry not master, alpha
<HebaruSan> Then get it live on the alpha server for a test drive
<VITAS> first problem: changes included on prod and not on github
<HebaruSan> That was solved with PR #198
<RockyTV> I remember fixing some bugs present on production and I even asked VITAS to backport them to the server
<VITAS> and i must not have done that
<VITAS> so prod=sd2=master
<RockyTV> are you sure
<VITAS> dev=dev-old+sd2
<RockyTV> because master doesn't contain any references to multi game support
<VITAS> =alpha
<VITAS> right?
<VITAS> sd2 has multigame
<RockyTV> nevermind I didn't find the blueprint :/
<VITAS> and if we untangled that mess succsessfully we can start using the dev sysetup to bring all existing code changes to beta and then production
<HebaruSan> Sounds like 15 minutes of intense gitwork
<VITAS> the untagle part?
<HebaruSan> BTW what's alembic :)
<RockyTV> if the current production code is in master
<RockyTV> that means what was in dev was never deployed?
<VITAS> all i know is that a lot of stuff on github never was delpoyed
<VITAS> i dont know whats what on github anymore :D
<HebaruSan> I will attempt to PR dev-old into alpha, but first I must watch a classic Twilight Zone episode with my wife
<HebaruSan> We are on to season 4 so they're an hour long now
<VITAS> most important!
<VITAS> youre entering THE TWILIGHT ZONE!
<RockyTV> it's so confusing that it may be better if we decided to rewrite the code and deployed it to alpha/beta to find bugs and then replace what's on production :P
<RockyTV> jk, it would take more time to rewrite the code
<RockyTV> still an option, though
<HebaruSan> It requires admin to the project on GitHub which I don't have
<RockyTV> I guess Thomas' not coming back to work on SD, right?
<HebaruSan> Well the first commit message on the dev branch says "(DO NOT PUT ON PRODUCTION!!!) not finished!", so maybe that's related to why things stopped getting copied to prod
<HebaruSan> Oh, that's the first commit with a conflict, not the first one period.
<VITAS> HebaruSan, you get whatever rights needed to let you do your job. :)
<VITAS> RockyTV, stop wanting to rewrite everything. you havent finished the last attempt.
<VITAS> thomas isnt gone from ksp its up to you to convince him to help you with your go thing.
<VITAS> my only aim right now is to make it easy for people to help keeping the current code alive. and MAYBE add some features. IF we manage that for the next years im good. If someone wants to make a new code vbersion froms cratch while this is going on ....and finishes it. im over the moon and will use that gladly.
<VITAS> but not the other way arround
<VITAS> .
* VITAS looks at the hook form and doesnt know what hook we want
<VITAS> i think i gave you more rights now
<VITAS> i find githubs settings pages a bit confusing
<RockyTV> I'm gonna just backport my file size changes to the current code then
<VITAS> thank you
<VITAS> just to clearify: im not against you rewriting parts or all of the code. IF you can get something to put into beta within a month.
<VITAS> i hope you understand that we need to keep the site going with minimal efforts because its mostly me beeing alon when it crashes.
<HebaruSan> Dev branch possibly rescued: https://github.com/KSP-SpaceDock/SpaceDock/pull/202
<RockyTV> damn it HebaruSan I bet you spend more time writing the PRs than doing git work :P
<HebaruSan> Heh, I do love documenting things
<VITAS> ANd i love that someone actuialy loves that
* VITAS had a productive day doign server/SD related stuff
<VITAS> somehow i was in the mood of coding so i scripted soem server automations
<VITAS> aaahhhhhh they realy elected layen
<VITAS> we are doomed
<VITAS> :(
<VITAS> shes pro censorship
<HebaruSan> of whom? ;)
<VITAS> huh?
<HebaruSan> What does she want to censor? Video games? Internet? Extreme politicians?
<VITAS> internet mainly
<VITAS> but as a mother of n children..... think of the CHILDREN!
<VITAS> and also she messed up our army too
<VITAS> but ive little interrest in that
<VITAS> :)
<VITAS> eu elctions are messed up anyways. she wasnt even a candidate
<VITAS> and they where so sure she will be elected that she quit her job before the election
<VITAS> but at least she now has to deal with the UK and possibly boris WOAAAHHH johnson :D
<VITAS> btw do you have enough rights on github now?
<HebaruSan> No, the hooks are in the "Settings" tab, and I don't have that (pasting screenshot of my own mod for comparison): https://imgur.com/a/wdUehmc
<VITAS> where does that webhook need to point
<HebaruSan> I think it's https://alpha.spacedock.info/hook
<HebaruSan> The code is under @app.route('/hook', methods=['POST'])
<VITAS> there are som old hooks int here
<VITAS> some jenkins
<VITAS> and one to port 5001/github
<HebaruSan> Those can probably stay unless they're broken or no longer needed
<VITAS> most likely broken
<VITAS> but we could have a new jenkins if you want
<HebaruSan> For running tests?
<VITAS> for example
<VITAS> and same for beta
<VITAS> secret?
<HebaruSan> Let's disable the one for beta until pull request 198 is deployed there, since otherwise it would pull from master
<VITAS> done
<VITAS> json or form content?
<HebaruSan> json
<HebaruSan> I think the secret can stay blank. Presumably that would be for authenticating the source, but the current code does that by checking the IP address
<VITAS> k
<HebaruSan> Maybe in the future if there's a problem we would add a secret
<VITAS> i can now if you want
<HebaruSan> Nah, no point until there's code to do sometihng with it
<VITAS> ok
<VITAS> need anything else from me?
<HebaruSan> Not at the moment, go get some rest
<VITAS> k lets see if i can allow myself that :)
HebaruSan has quit [Quit: HebaruSan]
HebaruSan has joined #spacedock
<RockyTV> HebaruSan, do you want me to keep #133 and just move to target alpha once #202 is merged?