Skip to content
This repository has been archived by the owner on Apr 16, 2023. It is now read-only.

Feature/sane defaults #884

Merged
merged 11 commits into from
Dec 22, 2017
Merged

Feature/sane defaults #884

merged 11 commits into from
Dec 22, 2017

Conversation

hixi
Copy link
Contributor

@hixi hixi commented Dec 14, 2017

No description provided.

@hixi hixi requested a review from das-g December 14, 2017 22:35
Makefile Outdated
compose-env/common.env: compose-env-dist/common.env
@mkdir -p $(@D)
sed -e 's/^\(DJANGO_OSMAXX_CONVERSION_SERVICE_\(USERNAME\|PASSWORD\)=\)/\1dev/' < $< > $@

PUBLIC_LOCALHOST_IP := $(shell ip route get 1 | awk '{print $$NF;exit}')
Copy link
Member

Choose a reason for hiding this comment

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

Seems like PUBLIC_LOCALHOST_IP isn't used anymore. If so, let's remove it, too.

Copy link
Contributor Author

@hixi hixi Dec 15, 2017

Choose a reason for hiding this comment

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

Good catch!

I did find an issue, that conversion_job.callback_url is pointing to localhost:8888 which is probably caused by not using this setting anymore. Since this varies between developer machines, I'm not sure how we should handle this. I have a proposal I'll push shortly.

@hixi
Copy link
Contributor Author

hixi commented Dec 15, 2017

Yes, that is a good proposal. Will push changes.

Copy link
Member

@das-g das-g left a comment

Choose a reason for hiding this comment

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

👍

Copy link
Member

@das-g das-g left a comment

Choose a reason for hiding this comment

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

I don't claim to understand all these changes, but I don't have any objections. 😛

@hixi hixi merged commit c032512 into develop Dec 22, 2017
@hixi hixi deleted the feature/sane-defaults branch December 22, 2017 08:45
@hixi hixi removed the in progress label Dec 22, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants