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.

Sign up for GitHub

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

Jump to bottom

Add support to upload dnsmasq.conf and Docker #1

Merged
merged 2 commits into from
Dec 28, 2020
Merged

Add support to upload dnsmasq.conf and Docker #1

merged 2 commits into from
Dec 28, 2020

Conversation

nferro
Copy link
Contributor

@nferro nferro commented Dec 21, 2020

Added support to upload dnsmasq.conf and:

  • removed Selenium dependency
  • added Docker support
  • added option to specify admin password as parameter

Added support to upload dnsmasq.conf and:
81c49a6 
* removed Selenium dependency
* added Docker support
* added option to specify admin password as parameter
@nferro
Copy link
Contributor Author

nferro commented Dec 21, 2020

Hi @Diego-Zulu!

I took upon your work and changed it a bit to match my necessities while keeping what you did working. The only breaking change is that the custom url for hosts is now specified with -u instead of -d and -d will be used to trigger the hosts file enablement.

I added Docker support and removed Selenium as I wasn't able to get Selenium working properly.

Let me know if you're interested in merging this to your repo or if I should do a complete fork ;)

@nferro nferro marked this pull request as draft December 21, 2020 13:10
@nferro nferro marked this pull request as ready for review December 21, 2020 13:10
Diego-Zulu
Diego-Zulu reviewed Dec 22, 2020
View reviewed changes
Copy link
Owner

@Diego-Zulu Diego-Zulu left a comment

Choose a reason for hiding this comment

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

Yooo this looks super good! I'm really glad you got to remove selenium and keyboard, those were some giant dependencies that felt like were bloating the project, and not having to worry about outdated selenium drivers is chef's kiss

I left some quick comments, after those I would consider this pretty much good to merge!

orbi_dnsmasq/orbi_dnsmasq.py Outdated Show resolved Hide resolved
orbi_dnsmasq/__main__.py Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
.gitignore Outdated Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
.dockerignore Outdated Show resolved Hide resolved
@nferro
Copy link
Contributor Author

nferro commented Dec 23, 2020

Just committed the changes you requested.

I think the README.md needs a big overhaul but currently I don't have time to do it so I just went with your suggestion on saying it's insecure to provide the password as parameter even though I don't agree with it. You can use an environment variable for it that you fill with read (or something similar on your shell) so it's not stored in the history.

@Diego-Zulu
Copy link
Owner

@all-contributors please add @nferro for development

@allcontributors
Copy link
Contributor

@Diego-Zulu

I couldn't determine any contributions to add, did you specify any contributions?
Please make sure to use valid contribution names.

@Diego-Zulu
Copy link
Owner

@all-contributors please add @nferro for code

@allcontributors allcontributors bot mentioned this pull request Dec 23, 2020
Merged
@allcontributors
Copy link
Contributor

@Diego-Zulu

I've put up a pull request to add @nferro! 🎉

@Diego-Zulu Diego-Zulu merged commit 8b19d32 into Diego-Zulu:master Dec 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Diego-Zulu Diego-Zulu Diego-Zulu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nferro @Diego-Zulu