diff options
Diffstat (limited to '0002-Add-Arch-Linux-Platform.patch')
| -rw-r--r-- | 0002-Add-Arch-Linux-Platform.patch | 151 |
1 files changed, 151 insertions, 0 deletions
diff --git a/0002-Add-Arch-Linux-Platform.patch b/0002-Add-Arch-Linux-Platform.patch new file mode 100644 index 000000000000..01c43d44b598 --- /dev/null +++ b/0002-Add-Arch-Linux-Platform.patch @@ -0,0 +1,151 @@ +From 5d78b9364c98435b5f3ee54a27c6c9294366c476 Mon Sep 17 00:00:00 2001 +From: Xiao-Long Chen <chenxiaolong@cxl.epac.to> +Date: Wed, 16 Apr 2014 19:32:33 -0400 +Subject: [PATCH 2/7] Add Arch Linux Platform + +--- + ipapython/platform/archlinux/__init__.py | 40 ++++++++++++++++++++++++++++++++ + ipapython/platform/archlinux/auth.py | 17 ++++++++++++++ + ipapython/platform/fedora16/service.py | 8 +++---- + ipapython/platform/fedora18/__init__.py | 2 +- + ipapython/setup.py | 1 + + ipapython/setup.py.in | 1 + + 6 files changed, 64 insertions(+), 5 deletions(-) + create mode 100644 ipapython/platform/archlinux/__init__.py + create mode 100644 ipapython/platform/archlinux/auth.py + +diff --git a/ipapython/platform/archlinux/__init__.py b/ipapython/platform/archlinux/__init__.py +new file mode 100644 +index 0000000..2b77bcc +--- /dev/null ++++ b/ipapython/platform/archlinux/__init__.py +@@ -0,0 +1,40 @@ ++import os ++ ++from ipapython.platform import fedora18, base ++from ipapython.platform.archlinux.auth import ArchLinuxAuthConfig ++ ++# All what we allow exporting directly from this module ++# Everything else is made available through these symbols when they are ++# directly imported into ipapython.services: ++# authconfig -- class reference for platform-specific implementation of ++# authconfig(8) ++# service -- class reference for platform-specific implementation of a ++# PlatformService class ++# knownservices -- factory instance to access named services IPA cares about, ++# names are ipapython.services.wellknownservices ++# backup_and_replace_hostname -- platform-specific way to set hostname and ++# make it persistent over reboots ++# restore_network_configuration -- platform-specific way of restoring network ++# configuration (e.g. static hostname) ++# restore_context -- platform-sepcific way to restore security context, if ++# applicable ++# check_selinux_status -- platform-specific way to see if SELinux is enabled ++# and restorecon is installed. ++__all__ = ['authconfig', 'service', 'knownservices', ++ 'backup_and_replace_hostname', 'restore_context', 'check_selinux_status', ++ 'restore_network_configuration', 'timedate_services'] ++ ++# Just copy a referential list of timedate services ++timedate_services = list(base.timedate_services) ++ ++def restore_network_configuration(fstore, statestore): ++ filepath = '/etc/hostname' ++ if fstore.has_file(filepath): ++ fstore.restore_file(filepath) ++ ++authconfig = ArchLinuxAuthConfig ++service = fedora18.service ++knownservices = fedora18.knownservices ++backup_and_replace_hostname = fedora18.backup_and_replace_hostname ++restore_context = fedora18.restore_context ++check_selinux_status = fedora18.check_selinux_status +diff --git a/ipapython/platform/archlinux/auth.py b/ipapython/platform/archlinux/auth.py +new file mode 100644 +index 0000000..67ee063 +--- /dev/null ++++ b/ipapython/platform/archlinux/auth.py +@@ -0,0 +1,17 @@ ++from ipapython.platform import base ++ ++class ArchLinuxAuthConfig(base.AuthConfig): ++ """ ++ Arch Linux implementation of the AuthConfig class. ++ ++ The freeipa package includes a sss-auth-setup.py Python 3 script which will ++ set up both the NSS and PAM configuration. However, this script modifies the ++ PAM configuration files directly, so the changes need to be undone before ++ pacman updates anything in /etc/pam.d/ and if any new configuration files ++ are added. ++ ++ It's probably best to have this handled manually. ++ """ ++ ++ def execute(self): ++ raise NotImplementedError +diff --git a/ipapython/platform/fedora16/service.py b/ipapython/platform/fedora16/service.py +index edf2d7f..7523761 100644 +--- a/ipapython/platform/fedora16/service.py ++++ b/ipapython/platform/fedora16/service.py +@@ -32,8 +32,8 @@ from ipalib import api + # mapping will be kept in this dictionary + system_units = dict(map(lambda x: (x, "%s.service" % (x)), base.wellknownservices)) + +-system_units['rpcgssd'] = 'nfs-secure.service' +-system_units['rpcidmapd'] = 'nfs-idmap.service' ++system_units['rpcgssd'] = 'rpc-gssd.service' ++system_units['rpcidmapd'] = 'rpc-idmapd.service' + + # Rewrite dirsrv and pki-tomcatd services as they support instances via separate + # service generator. To make this working, one needs to have both foo@.servic +@@ -144,8 +144,8 @@ class Fedora16CAService(Fedora16Service): + # false positives, so check for existence of our configuration file. + # TODO: Use a cleaner solution + use_proxy = True +- if not (os.path.exists('/etc/httpd/conf.d/ipa.conf') and +- os.path.exists('/etc/httpd/conf.d/ipa-pki-proxy.conf')): ++ if not (os.path.exists('/etc/httpd/conf/extra/ipa.conf') and ++ os.path.exists('/etc/httpd/conf/extra/ipa-pki-proxy.conf')): + root_logger.debug( + 'The httpd proxy is not installed, wait on local port') + use_proxy = False +diff --git a/ipapython/platform/fedora18/__init__.py b/ipapython/platform/fedora18/__init__.py +index d12bdca..2ac882c 100644 +--- a/ipapython/platform/fedora18/__init__.py ++++ b/ipapython/platform/fedora18/__init__.py +@@ -52,7 +52,7 @@ timedate_services = list(base.timedate_services) + def backup_and_replace_hostname(fstore, statestore, hostname): + old_hostname = socket.gethostname() + try: +- ipautil.run(['/bin/hostname', hostname]) ++ ipautil.run(['/usr/bin/hostname', hostname]) + except ipautil.CalledProcessError, e: + print >>sys.stderr, "Failed to set this machine hostname to %s (%s)." % (hostname, str(e)) + +diff --git a/ipapython/setup.py b/ipapython/setup.py +index cb24eee..cffbf6e 100644 +--- a/ipapython/setup.py ++++ b/ipapython/setup.py +@@ -68,6 +68,7 @@ def setup_package(): + packages = [ "ipapython", + "ipapython.platform", + "ipapython.platform.base", ++ "ipapython.platform.archlinux", + "ipapython.platform.fedora16", + "ipapython.platform.fedora18", + "ipapython.platform.redhat" ], +diff --git a/ipapython/setup.py.in b/ipapython/setup.py.in +index d3bbcaf..c7c6845 100644 +--- a/ipapython/setup.py.in ++++ b/ipapython/setup.py.in +@@ -68,6 +68,7 @@ def setup_package(): + packages = [ "ipapython", + "ipapython.platform", + "ipapython.platform.base", ++ "ipapython.platform.archlinux", + "ipapython.platform.fedora16", + "ipapython.platform.fedora18", + "ipapython.platform.redhat" ], +-- +1.9.2 + |