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

Add smart_proxy_dns_powerdns #833

Merged
merged 3 commits into from Nov 10, 2015
Merged

Conversation

@ekohl
Copy link
Member

@ekohl ekohl commented Oct 8, 2015

This is untested.

@ekohl ekohl force-pushed the ekohl:rpm/dns_powerdns branch 4 times, most recently from 31aafe0 to 87e4f6f Oct 8, 2015
@ekohl ekohl changed the title [WIP] Add smart_proxy_dns_powerdns Add smart_proxy_dns_powerdns Oct 9, 2015
@ekohl
Copy link
Member Author

@ekohl ekohl commented Oct 9, 2015

Tested on EL7 by locally building and installing the RPMs, running the foreman proxy, verifying the records end up in the database and powerdns returns them correctly.

@domcleal
Copy link
Contributor

@domcleal domcleal commented Oct 12, 2015

mysql2's failing to build in a non-SCL EL6 buildroot unfortunately. It looks like the version requirements on rubygems are the problem, but I honestly don't see why they're there. I suspect it's part of our history when we shipped our own rubygems package, so it should be safe to remove them.

http://koji.katello.org/koji/getfile?taskID=359118&name=root.log is the build log.

@ekohl
Copy link
Member Author

@ekohl ekohl commented Oct 17, 2015

@domcleal like this?


BuildRequires: %{?scl_prefix_ruby}ruby >= 1.8.6
BuildRequires: %{?scl_prefix_ruby}rubygems >= 1.8.10
BuildRequires: %{?scl_prefix_ruby}rubygems-devel

This comment has been minimized.

@domcleal

domcleal Oct 20, 2015
Contributor

You need this for macros to expand, but perhaps remove the version spec from the line above.

+ cp -a './%{gem_dir}/build_info' './%{gem_dir}/cache' './%{gem_dir}/doc' './%{gem_dir}/gems' './%{gem_dir}/specifications' '/builddir/build/BUILDROOT/rubygem-mysql2-0.3.19-2.git.229.98d6e60.git.229.98d6e60.el7.x86_64/%{gem_dir}'
cp: target '/builddir/build/BUILDROOT/rubygem-mysql2-0.3.19-2.git.229.98d6e60.git.229.98d6e60.el7.x86_64/%{gem_dir}' is not a directory
@@ -16,11 +16,9 @@ URL: http://mysql-win.rubyforge.org
Source0: http://rubygems.org/downloads/%{gem_name}-%{version}.gem

Requires: %{?scl_prefix_ruby}ruby >= 1.8.6
Requires: %{?scl_prefix_ruby}rubygems >= 1.8.10

This comment has been minimized.

@domcleal

domcleal Oct 20, 2015
Contributor

Also keep this line, but just remove the version bit.

This comment has been minimized.

@ekohl

ekohl Oct 29, 2015
Author Member

Done btw

This comment has been minimized.

@domcleal

domcleal Oct 29, 2015
Contributor

Sorry about that, I thought it was waiting for an update! Works well.

@ekohl
Copy link
Member Author

@ekohl ekohl commented Oct 20, 2015

I already updated the commits yesterday before you reviewed them, but forgot to push them so the latest code does not take the comments into account.

%{gem_libdir}
%{gem_instdir}/config
%{foreman_proxy_bundlerd_dir}/dns_powerdns.rb
%config(noreplace) %{foreman_proxy_settingsd_dir}/dns_powerdns.yml

This comment has been minimized.

@domcleal

domcleal Oct 29, 2015
Contributor

I think permissions on this file need to be restricted to root:foreman-proxy 0640, because it can contain a database password.

This comment has been minimized.

@ekohl

ekohl Oct 29, 2015
Author Member

Good point. I don't think that was done in the Debian packaging so I'll have a look there as well.

This comment has been minimized.

@mmoll

mmoll Oct 29, 2015

it was done for the route53 plugin, so have a look there, it's a but clumsy for .debs

@ekohl
Copy link
Member Author

@ekohl ekohl commented Nov 9, 2015

Rebased and added a %attr line.

domcleal added a commit that referenced this pull request Nov 10, 2015
@domcleal domcleal merged commit 0e2f822 into theforeman:rpm/develop Nov 10, 2015
1 check passed
1 check passed
@theforeman-bot
default Job result: SUCCESS
Details
@domcleal
Copy link
Contributor

@domcleal domcleal commented Nov 10, 2015

Thanks @ekohl, merged and building for 1.10 and nightly.

@ekohl ekohl deleted the ekohl:rpm/dns_powerdns branch Nov 10, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants