Re: [Freeipa-devel] [PATCH 0338] Drop configure.jar file
On 13.11.2015 10:17, Petr Vobornik wrote: On 11/12/2015 03:31 PM, Martin Basti wrote: 1. following first line should be removed as well: preferences_filename = paths.PREFERENCES_HTML -if ipautil.file_exists(preferences_filename): Which also means that PREFERENCES_HTML won't be used and can be removed. Aaa sorry my bad, I wanted to remove it from paths, I just somehow forgot to do that. Updated patch attached. ACK Pushed to master: 19044e87ac54200b7710b8ec5405175c3d749e76 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
Re: [Freeipa-devel] [PATCH 0338] Drop configure.jar file
On 11/12/2015 03:31 PM, Martin Basti wrote: 1. following first line should be removed as well: preferences_filename = paths.PREFERENCES_HTML -if ipautil.file_exists(preferences_filename): Which also means that PREFERENCES_HTML won't be used and can be removed. Aaa sorry my bad, I wanted to remove it from paths, I just somehow forgot to do that. Updated patch attached. ACK -- Petr Vobornik -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
Re: [Freeipa-devel] [PATCH 0338] Drop configure.jar file
On 12.11.2015 14:53, Petr Vobornik wrote:
On 11/12/2015 12:27 PM, Martin Basti wrote:
On 05.11.2015 18:27, Petr Vobornik wrote:
On 10/30/2015 09:31 AM, Martin Basti wrote:
https://fedorahosted.org/freeipa/ticket/5144
Patch attached.
configure.jar is basically a signed zip which contains
preferences.html therefore also all references to preferences.html
should be removed.
ssbrowser.html:
Also whole section "Automatic Configuration of older versions" should
be removed.
and list item:
"""
Import CA certificate. Make sure you checked
all three checkboxes.
"""
should be moved as a first item in the list in section Firefox
Thank you, updated patch attached.
1. following first line should be removed as well:
preferences_filename = paths.PREFERENCES_HTML
-if ipautil.file_exists(preferences_filename):
Which also means that PREFERENCES_HTML won't be used and can be removed.
Aaa sorry my bad, I wanted to remove it from paths, I just somehow
forgot to do that.
Updated patch attached.
From 6322ff96273e91abd1d7f24fe84270491e7e6b60 Mon Sep 17 00:00:00 2001
From: Martin Basti
Date: Tue, 27 Oct 2015 15:36:55 +0100
Subject: [PATCH] Drop configure.jar
Configure.jar used to be used with firefox version < 10 which is not
supported anymore, thus this can be removed.
https://fedorahosted.org/freeipa/ticket/5144
---
freeipa.spec.in| 4 --
install/html/ssbrowser.html| 25 +
install/share/Makefile.am | 1 -
install/share/preferences.html.template| 90 --
ipaplatform/base/paths.py | 2 -
ipaserver/install/httpinstance.py | 26 -
ipaserver/install/ipa_replica_prepare.py | 6 --
ipaserver/install/server/replicainstall.py | 12
8 files changed, 3 insertions(+), 163 deletions(-)
delete mode 100644 install/share/preferences.html.template
diff --git a/freeipa.spec.in b/freeipa.spec.in
index c3ca3413ffc3850b849a69adbbae8476355f3c76..f605f653a84c45c6ce0d949a921cef0c7ec508ca 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -473,13 +473,11 @@ mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/
/bin/touch %{buildroot}%{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
mkdir -p %{buildroot}%{_usr}/share/ipa/html/
/bin/touch %{buildroot}%{_usr}/share/ipa/html/ca.crt
-/bin/touch %{buildroot}%{_usr}/share/ipa/html/configure.jar
/bin/touch %{buildroot}%{_usr}/share/ipa/html/kerberosauth.xpi
/bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.con
/bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.js
/bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini
/bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con
-/bin/touch %{buildroot}%{_usr}/share/ipa/html/preferences.html
mkdir -p %{buildroot}%{_initrddir}
mkdir %{buildroot}%{_sysconfdir}/sysconfig/
install -m 644 init/ipa_memcached.conf %{buildroot}%{_sysconfdir}/sysconfig/ipa_memcached
@@ -840,13 +838,11 @@ fi
%{_usr}/share/ipa/ipa-pki-proxy.conf
%{_usr}/share/ipa/kdcproxy.conf
%ghost %attr(0644,root,apache) %config(noreplace) %{_usr}/share/ipa/html/ca.crt
-%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/configure.jar
%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/kerberosauth.xpi
%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb.con
%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb.js
%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb5.ini
%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krbrealm.con
-%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/preferences.html
%dir %{_usr}/share/ipa/updates/
%{_usr}/share/ipa/updates/*
%attr(755,root,root) %{plugin_dir}/libipa_pwd_extop.so
diff --git a/install/html/ssbrowser.html b/install/html/ssbrowser.html
index b88deac900fb1d5a1a5960741512593f9b7f3b15..325c2d393067c52fade653494c1917a9af51394f 100644
--- a/install/html/ssbrowser.html
+++ b/install/html/ssbrowser.html
@@ -10,18 +10,6 @@
$(document).ready(function() {
var domain = '.' + (IPA_DOMAIN || 'example.com');
$('.example-domain').text(domain);
-
-var browser = IPA.browser_config.get_browser();
-if (browser.mozilla) {
-var ff_config = $("#configurefirefox");
-var obj = $('', {
-type: 'text/html',
-'class': 'browser-config'
-});
-obj.prop('data', 'jar:/ipa/errors/configure.jar!/preferences.html');
-obj.appendTo(ff_config);
-ff_config.show();
-}
});
}
@@ -63,6 +51,9 @@
+Import CA certificate. Make sure you checked all three checkboxes.
+
+
In the address bar of Firefox, type about:config to display the list of current conf
Re: [Freeipa-devel] [PATCH 0338] Drop configure.jar file
On 11/12/2015 12:27 PM, Martin Basti wrote: On 05.11.2015 18:27, Petr Vobornik wrote: On 10/30/2015 09:31 AM, Martin Basti wrote: https://fedorahosted.org/freeipa/ticket/5144 Patch attached. configure.jar is basically a signed zip which contains preferences.html therefore also all references to preferences.html should be removed. ssbrowser.html: Also whole section "Automatic Configuration of older versions" should be removed. and list item: """ Import CA certificate. Make sure you checked all three checkboxes. """ should be moved as a first item in the list in section Firefox Thank you, updated patch attached. 1. following first line should be removed as well: preferences_filename = paths.PREFERENCES_HTML -if ipautil.file_exists(preferences_filename): Which also means that PREFERENCES_HTML won't be used and can be removed. -- Petr Vobornik -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
Re: [Freeipa-devel] [PATCH 0338] Drop configure.jar file
On 05.11.2015 18:27, Petr Vobornik wrote:
On 10/30/2015 09:31 AM, Martin Basti wrote:
https://fedorahosted.org/freeipa/ticket/5144
Patch attached.
configure.jar is basically a signed zip which contains
preferences.html therefore also all references to preferences.html
should be removed.
ssbrowser.html:
Also whole section "Automatic Configuration of older versions" should
be removed.
and list item:
"""
Import CA certificate. Make sure you checked
all three checkboxes.
"""
should be moved as a first item in the list in section Firefox
Thank you, updated patch attached.
From 5db38580da239a90079ddf838c92ea862f595863 Mon Sep 17 00:00:00 2001
From: Martin Basti
Date: Tue, 27 Oct 2015 15:36:55 +0100
Subject: [PATCH] Drop configure.jar
Configure.jar used to be used with firefox version < 10 which is not
supported anymore, thus this can be removed.
https://fedorahosted.org/freeipa/ticket/5144
---
freeipa.spec.in| 4 --
install/html/ssbrowser.html| 25 +
install/share/Makefile.am | 1 -
install/share/preferences.html.template| 90 --
ipaplatform/base/paths.py | 1 -
ipaserver/install/httpinstance.py | 26 -
ipaserver/install/ipa_replica_prepare.py | 5 --
ipaserver/install/server/replicainstall.py | 12
8 files changed, 3 insertions(+), 161 deletions(-)
delete mode 100644 install/share/preferences.html.template
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 913f03926ef3d2bcdcfc51a6036f7c076a7fb7ef..6430b67d8ac8cd95fb2626bedd5f2c00de0b9913 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -466,13 +466,11 @@ mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/
/bin/touch %{buildroot}%{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
mkdir -p %{buildroot}%{_usr}/share/ipa/html/
/bin/touch %{buildroot}%{_usr}/share/ipa/html/ca.crt
-/bin/touch %{buildroot}%{_usr}/share/ipa/html/configure.jar
/bin/touch %{buildroot}%{_usr}/share/ipa/html/kerberosauth.xpi
/bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.con
/bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.js
/bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini
/bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con
-/bin/touch %{buildroot}%{_usr}/share/ipa/html/preferences.html
mkdir -p %{buildroot}%{_initrddir}
mkdir %{buildroot}%{_sysconfdir}/sysconfig/
install -m 644 init/ipa_memcached.conf %{buildroot}%{_sysconfdir}/sysconfig/ipa_memcached
@@ -833,13 +831,11 @@ fi
%{_usr}/share/ipa/ipa-pki-proxy.conf
%{_usr}/share/ipa/kdcproxy.conf
%ghost %attr(0644,root,apache) %config(noreplace) %{_usr}/share/ipa/html/ca.crt
-%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/configure.jar
%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/kerberosauth.xpi
%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb.con
%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb.js
%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb5.ini
%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krbrealm.con
-%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/preferences.html
%dir %{_usr}/share/ipa/updates/
%{_usr}/share/ipa/updates/*
%attr(755,root,root) %{plugin_dir}/libipa_pwd_extop.so
diff --git a/install/html/ssbrowser.html b/install/html/ssbrowser.html
index b88deac900fb1d5a1a5960741512593f9b7f3b15..325c2d393067c52fade653494c1917a9af51394f 100644
--- a/install/html/ssbrowser.html
+++ b/install/html/ssbrowser.html
@@ -10,18 +10,6 @@
$(document).ready(function() {
var domain = '.' + (IPA_DOMAIN || 'example.com');
$('.example-domain').text(domain);
-
-var browser = IPA.browser_config.get_browser();
-if (browser.mozilla) {
-var ff_config = $("#configurefirefox");
-var obj = $('', {
-type: 'text/html',
-'class': 'browser-config'
-});
-obj.prop('data', 'jar:/ipa/errors/configure.jar!/preferences.html');
-obj.appendTo(ff_config);
-ff_config.show();
-}
});
}
@@ -63,6 +51,9 @@
+Import CA certificate. Make sure you checked all three checkboxes.
+
+
In the address bar of Firefox, type about:config to display the list of current configuration options.
@@ -77,16 +68,6 @@
You are all set.
-Automatic Configuration of older versions
-You can configure older versions of Firefox (up to version 14) using signed code. Use Firefox configuration page for newer versions.
-
-Import CA certificate. Make sure you checked all three checkboxes.
-
-Click on "
Re: [Freeipa-devel] [PATCH 0338] Drop configure.jar file
On 10/30/2015 09:31 AM, Martin Basti wrote: https://fedorahosted.org/freeipa/ticket/5144 Patch attached. configure.jar is basically a signed zip which contains preferences.html therefore also all references to preferences.html should be removed. ssbrowser.html: Also whole section "Automatic Configuration of older versions" should be removed. and list item: """ Import CA certificate. Make sure you checked all three checkboxes. """ should be moved as a first item in the list in section Firefox -- Petr Vobornik -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
