First batch of commits to remove AFP/Netatalk

rockstor · Mar 14, 2020 · 8f73a86 · 8f73a86
1 parent 705e873
commit 8f73a86
Show file tree

Hide file tree

Showing 25 changed files with 3 additions and 7,332 deletions.
diff --git a/base-buildout.cfg b/base-buildout.cfg
@@ -59,7 +59,7 @@ command =
 	at samba-winbind samba-winbind-clients \
 	oddjob-mkhomedir pam_krb5 krb5-workstation postgresql \
 	postgresql-server postgresql-devel kernel-ml btrfs-progs rsync \
-	nfs-utils avahi netatalk smartmontools net-tools sos hdparm \
+	nfs-utils avahi smartmontools net-tools sos hdparm \
 	postfix cyrus-sasl-plain yum-cron nano usbutils pciutils shellinabox \
 	epel-release cryptsetup docker-ce python-distro yum-changelog
 

diff --git a/src/rockstor/scripts/prep_db.py b/src/rockstor/scripts/prep_db.py
@@ -22,7 +22,6 @@
 
 def register_services():
     services = {
-        "AFP": "netatalk",
         "NFS": "nfs",
         "Samba": "smb",
         "NIS": "nis",

diff --git a/src/rockstor/smart_manager/urls/services.py b/src/rockstor/smart_manager/urls/services.py
@@ -18,7 +18,6 @@
 
 from django.conf.urls import patterns, url
 from smart_manager.views import (
-    AFPServiceView,
     ActiveDirectoryServiceView,
     BaseServiceView,
     BootstrapServiceView,
@@ -47,9 +46,6 @@
     '',
     # Services
     url(r'^$', BaseServiceView.as_view()),
-    url(r'^netatalk$', AFPServiceView.as_view()),
-    url(r'^netatalk/(?P<command>%s)$' % command_regex,
-        AFPServiceView.as_view()),
     url(r'^nis$', NISServiceView.as_view()),
     url(r'^nis/(?P<command>%s)$' % command_regex, NISServiceView.as_view()),
     url(r'^smb$', SambaServiceView.as_view()),

diff --git a/src/rockstor/smart_manager/views/__init__.py b/src/rockstor/smart_manager/views/__init__.py
@@ -45,7 +45,6 @@
 from ts_service import TaskSchedulerServiceView  # noqa E501
 from dc_service import DataCollectorServiceView  # noqa E501
 from sm_service import ServiceMonitorView  # noqa E501
-from afp_service import AFPServiceView  # noqa E501
 from snmp_service import SNMPServiceView  # noqa E501
 from docker_service import DockerServiceView  # noqa E501
 from smartd_service import SMARTDServiceView  # noqa E501

diff --git a/src/rockstor/smart_manager/views/afp_service.py b/src/rockstor/smart_manager/views/afp_service.py