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

Fix FTP site binding error #380

Merged
merged 3 commits into from
Jun 21, 2017
Merged

Fix FTP site binding error #380

merged 3 commits into from
Jun 21, 2017

Conversation

fdzedzy
Copy link

@fdzedzy fdzedzy commented Jun 21, 2017

Description

Fixes issue with trying to use ftp as a site binding.

Issues Resolved

#368

Check List

fdzedzy added 3 commits June 21, 2017 13:40
Signed-off-by: fdzedzy <fdzedzy@frontlinetechnologies.com>
Signed-off-by: fdzedzy <fdzedzy@frontlinetechnologies.com>
Signed-off-by: fdzedzy <fdzedzy@frontlinetechnologies.com>
@EasyAsABC123
Copy link
Contributor

thanks @fdzedzy love you

@fdzedzy
Copy link
Author

fdzedzy commented Jun 21, 2017

@EasyAsABC123 I had to add the mod_ftp recipe to the site test recipe. I wasn't sure if you preferred that, or would prefer a separate ftp_site test recipe so that it doesn't add the ftp services to the normal site unit tests.

@EasyAsABC123
Copy link
Contributor

@fdzedzy i think it belongs in the site unit tests since it is on the site resource. But i definitely see that the other way might be nice too, for it to be a separate test i'd think we'd want to make a new resource just for FTP but i'm not sure how valuable that is.

@fdzedzy
Copy link
Author

fdzedzy commented Jun 21, 2017

@EasyAsABC123 Sounds good. Might also want to add validation as well to the site resource that sets the bindings to throw an error if FTP services aren't installed since mod_ftp is not installed by default.

@EasyAsABC123
Copy link
Contributor

@fdzedzy valid point and a good one at that. I wonder if you could just include the recipe in an if clause.

@EasyAsABC123 EasyAsABC123 merged commit d986c22 into sous-chefs:master Jun 21, 2017
@fdzedzy
Copy link
Author

fdzedzy commented Jun 21, 2017

@EasyAsABC123 Thanks for the merge! I'm testing out some ideas to include the mod_ftp recipe if it isn't included, but I don't think it would need to hold up this fix since this is how it previously worked. If I get something, I'll submit a PR to see if you think it would be useful or not.

@EasyAsABC123
Copy link
Contributor

@fdzedzy no no no thank you for the PR always helpful!

kamaradclimber added a commit to criteo-forks/iis that referenced this pull request Jul 18, 2017
Most of the merge work is based on the fact that pool provider has been
replaced by a custom resource.

From all the non-merged criteo patches:
51e609a Fix decoding of entities in XML
5034448 Clarify execute tasks
43186f1 Activate use_inline_resources
99c4187 Remove unnecessary Chef logs
280fba8 Fix regression introduced with whyrun support
e85ca2f Fix the site_identifier privacy so that the execute context can use it
12ac82f Post review fixes
d534851 Removed new_resource.updated_by_last_action occurences
f9b773d Make the pool provider whyrun able

all are either unnecessary or correctly applied

* 'master' of https://github.com/chef-cookbooks/iis: (145 commits)
  Adds better documentation for the options parameter (sous-chefs#383)
  release 6.7.2 (sous-chefs#382)
  Fix FTP site binding error (sous-chefs#380)
  Release v6.7.1 (sous-chefs#379)
  Fix issue with guard clause missing on check (sous-chefs#378)
  Release v6.7.0 (sous-chefs#376)
  fix multiple bugs with iis_vdir iis_root iis_app for idempotency (sous-chefs#375)
  Release v6.6.0 (sous-chefs#373)
  Update appveyor.yml
  Enhancement module custom resource (sous-chefs#372)
  Fix README.md (sous-chefs#367)
  Release v6.5.3 (sous-chefs#371)
  Resolves a bug in iis_vdir also adds more liberty in config (sous-chefs#370)
  Refactor vdir name property to site_name (sous-chefs#359)
  Release v6.5.2 (sous-chefs#364)
  Update iis_vdir name to not require a trailing / (sous-chefs#363)
  Fix iis_pool identity_type issue (sous-chefs#362)
  Release v6.5.1 (sous-chefs#358)
  Add quotes to pool name (sous-chefs#357)
  Release v6.5.0 (sous-chefs#352)
  ...

Change-Id: I951fb2d1788d877c98b24bb22cb5d035162e146d
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.

2 participants