summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--freeipa.spec.in3
-rw-r--r--ipa-client/Makefile.am1
-rw-r--r--ipa-client/configure.ac1
-rw-r--r--ipa-client/firefox/Makefile.am18
-rw-r--r--ipa-client/firefox/README23
-rw-r--r--ipa-client/firefox/globalsetup.sh52
-rw-r--r--ipa-client/firefox/ipa.cfg19
-rw-r--r--ipa-client/firefox/ipa.js34
-rw-r--r--ipa-client/firefox/usersetup.sh40
9 files changed, 0 insertions, 191 deletions
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 11ae934d9..231c634ab 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -760,11 +760,8 @@ fi
%{_sbindir}/ipa-rmkeytab
%{_sbindir}/ipa-join
%dir %{_usr}/share/ipa
-%dir %{_usr}/share/ipa/ipaclient
%dir %{_localstatedir}/lib/ipa-client
%dir %{_localstatedir}/lib/ipa-client/sysrestore
-%{_usr}/share/ipa/ipaclient/ipa.cfg
-%{_usr}/share/ipa/ipaclient/ipa.js
%dir %{python_sitelib}/ipaclient
%{python_sitelib}/ipaclient/*.py*
%{_mandir}/man1/ipa-getkeytab.1.gz
diff --git a/ipa-client/Makefile.am b/ipa-client/Makefile.am
index b7d70fd8d..ca251ae9d 100644
--- a/ipa-client/Makefile.am
+++ b/ipa-client/Makefile.am
@@ -81,7 +81,6 @@ ipa_join_LDADD = \
$(NULL)
SUBDIRS = \
- firefox \
ipaclient \
ipa-install \
man \
diff --git a/ipa-client/configure.ac b/ipa-client/configure.ac
index bb4ac854b..82b09615c 100644
--- a/ipa-client/configure.ac
+++ b/ipa-client/configure.ac
@@ -205,7 +205,6 @@ dnl ---------------------------------------------------------------------------
AC_CONFIG_FILES([
Makefile
- firefox/Makefile
ipaclient/Makefile
ipa-install/Makefile
man/Makefile
diff --git a/ipa-client/firefox/Makefile.am b/ipa-client/firefox/Makefile.am
deleted file mode 100644
index daf694248..000000000
--- a/ipa-client/firefox/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-NULL =
-
-appdir = $(IPA_DATA_DIR)/ipaclient
-app_DATA = \
- ipa.cfg \
- ipa.js \
- $(NULL)
-
-EXTRA_DIST = \
- README \
- $(app_DATA) \
- globalsetup.sh \
- usersetup.sh \
- $(NULL)
-
-MAINTAINERCLEANFILES = \
- *~ \
- Makefile.in
diff --git a/ipa-client/firefox/README b/ipa-client/firefox/README
deleted file mode 100644
index 67013fcca..000000000
--- a/ipa-client/firefox/README
+++ /dev/null
@@ -1,23 +0,0 @@
-Firefox automatic configuration.
-
-ipa.cfg needs to be installed in the Firefox root directory
-(/usr/lib/firefox-version). It can be a symlink somewhere else. We install
-the actual file into /usr/share/ipa.
-
-ipa.js contains the javascript that sets the desired configuration.
-
-The Firefox all.js needs to be modified to set:
-
-pref('general.config.obscure_value', 0);
-pref('general.config.filename', 'ipa.cfg');
-
-First need to remove any existing values for these.
-
-For more information on autoconfiguration, see:
-http://mit.edu/~firefox/www/maintainers/autoconfig.html
-
-globalsetup.sh will change the default setup for all users and will
-lock the preferences. The downside is that rpm -V will show firefox as
-corrupt.
-
-usersetup.sh will change all existing profiles of the current user
diff --git a/ipa-client/firefox/globalsetup.sh b/ipa-client/firefox/globalsetup.sh
deleted file mode 100644
index 698fbeb72..000000000
--- a/ipa-client/firefox/globalsetup.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-ipacfg="ipa.cfg"
-
-for file in /usr/lib/firefox-* /usr/lib64/firefox*
-do
- # Find the configuration file we want to change
- cfg=`find $file -name all.js`
-
- # determine the directory by removing all.js
- dir=`echo $cfg | sed 's/greprefs\/all.js//'`
-
- # It is possible that there will be empty Firefox directories, so skip
- # those.
- if test "X"$cfg != "X"; then
-
- rm -f $cfg.new
-
- # If the configuration already exists, remove it
- if grep general.config.filename $cfg > /dev/null 2>&1; then
- grep -v general.config.filename $cfg > $cfg.new
- mv $cfg.new $cfg
- fi
-
- # We have the configuration unobscured
- if grep general.config.filename $cfg > /dev/null 2>&1; then
- grep -v general.config.obscure_value $cfg > $cfg.new
- mv $cfg.new $cfg
- fi
-
- # Now we can add the new stuff to the file
- echo "pref('general.config.obscure_value', 0);" >> "$cfg"
- echo "pref('general.config.filename', '$ipacfg');" >> "$cfg"
-
- # Create a link to our configuration file
- rm -f $dir/$ipacfg
- ln -s /usr/share/ipa/ipa.cfg $dir/$ipacfg
- fi
-done
diff --git a/ipa-client/firefox/ipa.cfg b/ipa-client/firefox/ipa.cfg
deleted file mode 100644
index 022ef9993..000000000
--- a/ipa-client/firefox/ipa.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-lockPref("autoadmin.global_config_url","file:///usr/share/ipa/ipa.js");
diff --git a/ipa-client/firefox/ipa.js b/ipa-client/firefox/ipa.js
deleted file mode 100644
index 0f4c91247..000000000
--- a/ipa-client/firefox/ipa.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-try
-{
- /* Kerberos SSO configuration */
- lockPref("network.negotiate-auth.trusted-uris", ".freeipa.org");
- lockPref("network.negotiate-auth.delegation-uris", ".freeipa.org");
-
- /* These are the defaults */
- lockPref("network.negotiate-auth.gsslib", "");
- lockPref("network.negotiate-auth.using-native-gsslib", true);
- lockPref("network.negotiate-auth.allow-proxies", true);
-
- /* For Windows */
- lockPref("network.auth.use-sspi", false);
-}
-catch(e)
-{
- displayError("Error in Autoconfig", e);
-}
diff --git a/ipa-client/firefox/usersetup.sh b/ipa-client/firefox/usersetup.sh
deleted file mode 100644
index 99b301606..000000000
--- a/ipa-client/firefox/usersetup.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-for file in `find $HOME/.mozilla -name prefs.js`
-do
- rm -f $file.new
-
- # If the configuration already exists, remove it
- if grep network.negotiate- $file > /dev/null 2>&1; then
- grep -v network.negotiate- $file > $file.new
- mv $file.new $file
- fi
-
- # We have the configuration unobscured
- if grep network.auth.use-sspi $file > /dev/null 2>&1; then
- grep -v network.auth.use-sspi $file > $file.new
- mv $file.new $file
- fi
-
- # Now we can add the new stuff to the file
- echo "user_pref('network.auth.use-sspi', false);" >> $file
- echo "user_pref('network.cookie.prefsMigrated', true);" >> $file
- echo "user_pref('network.negotiate-auth.allow-proxies', true);" >> $file
- echo "user_pref('network.negotiate-auth.delegation-uris', '.freeipa.org');" >> $file
- echo "user_pref('network.negotiate-auth.gsslib', '');" >> $file
- echo "user_pref('network.negotiate-auth.trusted-uris', '.freeipa.org');" >> $file
- echo "user_pref('network.negotiate-auth.using-native-gsslib', true);" >> $file
-done