Merge tag '0.3.3.404'

README.md

@@ -1,16 +1,43 @@
 # Cockpit ZFS Manager
 
+[![GitHub Tag](https://img.shields.io/github/v/release/optimans/cockpit-zfs-manager?include_prereleases&style=flat-square&color=brightgreen)](https://github.com/optimans/cockpit-zfs-manager/releases)
+
 **An interactive ZFS on Linux admin package for Cockpit.**
 
 ### WARNING!
 
-Cockpit ZFS Manager is currently pre-release software.
+Cockpit ZFS Manager is currently pre-release software. Use at your own risk!
 
 ## Requirements
 
  * Cockpit: 201+
- * Samba: 4+
+ * NFS (Optional)
+ * Samba: 4+ (Optional)
  * ZFS: 0.8+
+
+ <details>
+  <summary>Tested Distributions</summary>
+
+  * Arch Linux
+  * CentOS Linux 8
+  * Debian 10
+  * Fedora 31
+  * Oracle Linux Server 8
+  * Proxmox VE 6
+  * Red Hat Enterprise Linux 8
+  * Ubuntu 18.04 LTS
+  * Ubuntu 19.10
+
+</details>
+
+## Screenshots
+<img src="https://user-images.githubusercontent.com/58222345/80313061-69dff180-881b-11ea-98d4-e245ed8faffd.png" width="425" /> <img src="https://user-images.githubusercontent.com/58222345/80313062-6b111e80-881b-11ea-9d0e-d4bcac251bf1.png" width="425" />
+<img src="https://user-images.githubusercontent.com/58222345/80313064-6c424b80-881b-11ea-812f-ab3a99edef75.png" width="425" />
+<img src="https://user-images.githubusercontent.com/58222345/80313065-6d737880-881b-11ea-8bad-a37506c2ce12.png" width="425" />
+<img src="https://user-images.githubusercontent.com/58222345/80313066-6f3d3c00-881b-11ea-859d-a47cf1e85177.png" width="425" />
+<img src="https://user-images.githubusercontent.com/58222345/80313067-7106ff80-881b-11ea-9688-0c94f8088b3b.png" width="425" />
+
+<sup>Screenshots using Cockpit 217 on Oracle Linux 8.1 with UEK R6.</sup>
 
 ## Installation
 
@@ -34,16 +61,14 @@ $ sudo nano /etc/samba/smb.conf
 Append to [global] section or individual share sections
 
 ```
-[global]
-~
 shadow: snapdir = .zfs/snapshot
 shadow: sort = desc
 shadow: format = %Y.%m.%d-%H.%M.%S
 shadow: localtime = yes	
 vfs objects = acl_xattr shadow_copy2
 ```
 
-### SELinux
+#### SELinux
 
 If using SELinux in enforcing mode, it is recommended to enable the boolean states for Samba:
 
@@ -98,6 +123,8 @@ ZFS always creates shares in /var/lib/samba/usershares folder when ShareSMB prop
 If enabled, Cockpit ZFS Manager manages shares for the file systems only. Samba global configuration will need to be configured externally.
 ## More Information
 
+* [ServeTheHome and ServeThe.Biz Forums](https://forums.servethehome.com/index.php?threads/25668/)
+
 ## Guides
 
- * [Installation Example for CentOS 8.0 as an Active Directory Domain Services (AD DS) Member](guides/CentOS-8.0.md)
+ * [CentOS 8 as an Active Directory Domain Services (AD DS) Member](guides/CentOS-8.md)

guides/CentOS-8.0.md → guides/CentOS-8.md

@@ -1,4 +1,10 @@
-# Installation Example for CentOS 8.0 as an Active Directory Domain Services (AD DS) Member
+# CentOS 8 as an Active Directory Domain Services (AD DS) Member
+
+> Assumption is made that this is a newly installed base system
+>
+> Replace *DOMAIN* with AD DS NetBIOS Name and *domain.example.com* with AD DS FQDN
+
+### DNF
 
 Install EPEL and PowerTools:
 
@@ -8,10 +14,12 @@ $ sudo dnf config-manager --enable PowerTools
 $ sudo dnf update
 ```
 
+### Cockpit
+
 Remove old version of Cockpit if version is less than 201 and install latest Cockpit Preview
 
 ```bash
-$ sudo dnf remove cockpit*
+$ sudo dnf remove cockpit\*
 $ sudo dnf config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/cockpit/cockpit-preview/repo/epel-8/group_cockpit-cockpit-preview-epel-8.repo
 
 $ sudo dnf install cockpit cockpit-storaged setroubleshoot-server
@@ -30,7 +38,18 @@ $ sudo firewall-cmd --permanent --zone=public --add-service=cockpit
 $ sudo firewall-cmd --reload
 ```
 
-Install ZFS as per own requirements from ZFS on Linux: [https://github.com/zfsonlinux/zfs/wiki/Custom-Packages](https://github.com/zfsonlinux/zfs/wiki/Custom-Packages)
+Install Cockpit ZFS Manager
+
+```bash
+$ git clone https://github.com/optimans/cockpit-zfs-manager.git
+$ sudo cp -r cockpit-zfs-manager/zfs /usr/share/cockpit
+```
+
+### ZFS
+
+Install ZFS as per own requirements from ZFS on Linux: [https://github.com/openzfs/zfs/wiki/RHEL-and-CentOS](https://github.com/openzfs/zfs/wiki/RHEL-and-CentOS)
+
+### Samba
 
 Install Samba
 
@@ -45,6 +64,7 @@ $ sudo rm /etc/samba/smb.conf
 Join AD DS:
 
 ```bash
+$ sudo realm discover -vvv domain.example.com
 $ sudo realm join --client-software=winbind domain.example.com -U Administrator
 ```
 
@@ -72,8 +92,6 @@ $ sudo nano /etc/samba/smb.conf
 Append to [global] section
 
 ```
-[global]
-~
 idmap config DOMAIN : schema_mode = rfc2307
 
 vfs objects = acl_xattr shadow_copy2
@@ -100,6 +118,7 @@ Grant Disk Operator Privileges:
 
 ```bash
 $ sudo net rpc rights grant "DOMAIN\Domain Admins" SeDiskOperatorPrivilege -U "DOMAIN\Administrator"
+$ sudo net rpc rights grant "DOMAIN\Enterprise Admins" SeDiskOperatorPrivilege -U "DOMAIN\Administrator"
 ```
 Enable SELinux booleans:
 
@@ -115,10 +134,43 @@ $ sudo firewall-cmd --reload
 ```
 
 Restart and Enable Samba service:
+
 ```bash
 $ sudo systemctl restart smb
 $ sudo systemctl enable smb
 ```
 
-#### Red Hat Enterprise Linux 8 Documentation
+### Local Authorisation
+
+Edit Kerberos configuration file to enable domain users to authenticate to local services:
+
+```bash
+$ sudo nano /etc/krb5.conf
+```
+
+Append to end of file
+
+```
+[plugins]
+    localauth = {
+        module = winbind:/usr/lib64/samba/krb5/winbind_krb5_localauth.so
+        enable_only = winbind
+    }
+```
+
+Create sudoers configuration file to allow sudo access to domain groups
+
+```bash
+$ sudo nano /etc/sudoers.d/DOMAIN
+```
+
+Add to file
+
+```
+DOMAIN\\Domain\ Admins ALL=(ALL) ALL
+DOMAIN\\Enterprise\ Admins ALL=(ALL) ALL
+```
+
+### Red Hat Enterprise Linux 8 Documentation
+
  * [Chapter 2. Using Samba as a Server](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/deploying_different_types_of_servers/assembly_using-samba-as-a-server_deploying-different-types-of-servers)

zfs/index.html

@@ -25,7 +25,7 @@
     <meta charset="utf-8">
     <meta content="width=device-width, initial-scale=1.0" name="viewport">
 
-    <link href="../base1/patternfly.css" rel="stylesheet" type="text/css">
+    <link href="patternfly.min.css" rel="stylesheet" type="text/css">
     <link href="zfs.css" rel="stylesheet" type="text/css">
 
     <script src="../base1/jquery.js"></script>