diff options
author | Simo Sorce <ssorce@redhat.com> | 2008-02-21 09:38:39 -0500 |
---|---|---|
committer | Simo Sorce <ssorce@redhat.com> | 2008-02-21 09:38:39 -0500 |
commit | 33b746df58b4da5cef7bebd096e1759a02746341 (patch) | |
tree | afe32cd959839ffd24bf9d02ab682217c1d794ca | |
parent | f87db10a0735778e5b0ea89ed121a8f12b23e833 (diff) | |
parent | e368fa18443b70141cdd3bed804a22c70ddd12af (diff) | |
download | freeipa-33b746df58b4da5cef7bebd096e1759a02746341.tar.gz freeipa-33b746df58b4da5cef7bebd096e1759a02746341.tar.xz freeipa-33b746df58b4da5cef7bebd096e1759a02746341.zip |
merge
-rw-r--r-- | ipa-client/ipa-install/ipa-client-install | 6 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/static/css/style_freeipa.css | 2 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/static/css/style_platform-objects.css | 2 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/static/images/branding/logo.png | bin | 36347 -> 8560 bytes | |||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/static/images/logo.png | bin | 18786 -> 8560 bytes | |||
-rw-r--r-- | ipa-server/selinux/Makefile | 1 | ||||
-rw-r--r-- | ipa-server/selinux/ipa_kpasswd/ipa_kpasswd.te | 2 | ||||
-rw-r--r-- | ipa-server/selinux/ipa_webgui/ipa_webgui.te | 2 |
8 files changed, 10 insertions, 5 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 177a727e4..318994118 100644 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -157,6 +157,7 @@ def main(): opts.append({'name':'empty', 'type':'empty'}) ipaconf.newConf("/etc/ipa/ipa.conf", opts) + print "Created /etc/ipa/ipa.conf" # Configure ldap.conf ldapconf = ipaclient.ipachangeconf.IPAChangeConf("IPA Installer") @@ -175,6 +176,7 @@ def main(): opts.append({'name':'empty', 'type':'empty'}) try: ldapconf.newConf("/etc/ldap.conf", opts) + print "Configured /etc/ldap.conf" except Exception, e: print "Configuration failed: " + str(e) return 1 @@ -235,9 +237,11 @@ def main(): opts.append({'name':'appdefaults', 'type':'section', 'value':appopts}) krbconf.newConf("/etc/krb5.conf", opts); + print "Configured /etc/krb5.conf for IPA realm " + ds.getRealmName() #Modify nsswitch to add nss_ldap run(["/usr/sbin/authconfig", "--enableldap", "--update"]) + print "LDAP enabled" #Check nss_ldap is working properly if not options.on_master: @@ -257,9 +261,11 @@ def main(): #Modify pam to add pam_krb5 run(["/usr/sbin/authconfig", "--enablekrb5", "--update"]) + print "Kerberos 5 enabled" if options.conf_ntp and not options.on_master: ipaclient.ntpconf.config_ntp(ds.getServerName()) + print "NTP enabled" print "Client configuration complete." diff --git a/ipa-server/ipa-gui/ipagui/static/css/style_freeipa.css b/ipa-server/ipa-gui/ipagui/static/css/style_freeipa.css index 1aa42622c..5eafa9b1a 100644 --- a/ipa-server/ipa-gui/ipagui/static/css/style_freeipa.css +++ b/ipa-server/ipa-gui/ipagui/static/css/style_freeipa.css @@ -1,7 +1,5 @@ /* freeipa-specific styles */ -body { background-color: red !important !important; } - #login { float: right; padding-top: 15px; diff --git a/ipa-server/ipa-gui/ipagui/static/css/style_platform-objects.css b/ipa-server/ipa-gui/ipagui/static/css/style_platform-objects.css index 4e5ff9906..bb9e805ab 100644 --- a/ipa-server/ipa-gui/ipagui/static/css/style_platform-objects.css +++ b/ipa-server/ipa-gui/ipagui/static/css/style_platform-objects.css @@ -1,4 +1,4 @@ -r/* object h1 styles */ +/* object h1 styles */ #details h1.overview { background-image: url('/static/images/objects/object-overview.png'); } diff --git a/ipa-server/ipa-gui/ipagui/static/images/branding/logo.png b/ipa-server/ipa-gui/ipagui/static/images/branding/logo.png Binary files differindex e966954b0..ebabed790 100644 --- a/ipa-server/ipa-gui/ipagui/static/images/branding/logo.png +++ b/ipa-server/ipa-gui/ipagui/static/images/branding/logo.png diff --git a/ipa-server/ipa-gui/ipagui/static/images/logo.png b/ipa-server/ipa-gui/ipagui/static/images/logo.png Binary files differindex 096c8813f..ebabed790 100644 --- a/ipa-server/ipa-gui/ipagui/static/images/logo.png +++ b/ipa-server/ipa-gui/ipagui/static/images/logo.png diff --git a/ipa-server/selinux/Makefile b/ipa-server/selinux/Makefile index 9fb5bbe40..03c3ee309 100644 --- a/ipa-server/selinux/Makefile +++ b/ipa-server/selinux/Makefile @@ -19,6 +19,7 @@ maintainer-clean: clean distclean: clean install: all + install -d $(POLICY_DIR) install -m 644 ipa_webgui/ipa_webgui.pp $(POLICY_DIR) install -m 644 ipa_kpasswd/ipa_kpasswd.pp $(POLICY_DIR) diff --git a/ipa-server/selinux/ipa_kpasswd/ipa_kpasswd.te b/ipa-server/selinux/ipa_kpasswd/ipa_kpasswd.te index 81fbad277..91e756b4d 100644 --- a/ipa-server/selinux/ipa_kpasswd/ipa_kpasswd.te +++ b/ipa-server/selinux/ipa_kpasswd/ipa_kpasswd.te @@ -44,7 +44,7 @@ corenet_udp_sendrecv_all_nodes(ipa_kpasswd_t) corenet_raw_sendrecv_all_nodes(ipa_kpasswd_t) corenet_tcp_sendrecv_all_ports(ipa_kpasswd_t) corenet_udp_sendrecv_all_ports(ipa_kpasswd_t) -corenet_all_recvfrom_unlabeled(ipa_kpasswd_t) +corenet_non_ipsec_sendrecv(ipa_kpasswd_t) corenet_tcp_bind_all_nodes(ipa_kpasswd_t) corenet_udp_bind_all_nodes(ipa_kpasswd_t) corenet_tcp_bind_kerberos_admin_port(ipa_kpasswd_t) diff --git a/ipa-server/selinux/ipa_webgui/ipa_webgui.te b/ipa-server/selinux/ipa_webgui/ipa_webgui.te index e2fd6d187..02e20d492 100644 --- a/ipa-server/selinux/ipa_webgui/ipa_webgui.te +++ b/ipa-server/selinux/ipa_webgui/ipa_webgui.te @@ -83,7 +83,7 @@ corenet_udp_sendrecv_all_nodes(ipa_webgui_t) corenet_raw_sendrecv_all_nodes(ipa_webgui_t) corenet_tcp_sendrecv_all_ports(ipa_webgui_t) corenet_udp_sendrecv_all_ports(ipa_webgui_t) -corenet_all_recvfrom_unlabeled(ipa_webgui_t) +corenet_non_ipsec_sendrecv(ipa_webgui_t) corenet_tcp_bind_all_nodes(ipa_webgui_t) corenet_udp_bind_all_nodes(ipa_webgui_t) corenet_tcp_bind_http_cache_port(ipa_webgui_t) |