Renamed all the packages.

.gitlab-ci.yml

@@ -36,8 +36,6 @@ package:cron:
   <<: *package
 package:dns:
   <<: *package
-package:doc:
-  <<: *package
 package:email:
   <<: *package
 package:firewall:
@@ -46,7 +44,7 @@ package:ftpd:
   <<: *package
 package:httpd:
   <<: *package
-package:meta:
+package:core:
   <<: *package
 package:monit:
   <<: *package
@@ -58,8 +56,6 @@ package:updater:
   <<: *package
 package:webmail:
   <<: *package
-package:xmpp:
-  <<: *package
 
 # This builds the debian packages and drops them in a very simple local repo
 #   so they can be installed during the next (install) step.
@@ -92,7 +88,6 @@ publish:
 # This stage runs on a VM running VirtualBox 5, which the gitlab-runner controls.
 # The vbox:stretch image is a pre-installed minimal copy of Debian Stretch.
 
-
 .install: &install
   tags:
     - vbox:stretch
@@ -108,7 +103,6 @@ publish:
     - apt-get -qq update
     - echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
     - apt-get -y --allow-unauthenticated install --install-recommends bytemark-symbiosis
-    - chmod -x $( which gitlab-runner )
     - run-parts --verbose --exit-on-error autotest/test.d
   variables: &installvars
     DEBIAN_RELEASE: stretch
@@ -116,7 +110,6 @@ publish:
     CI_DEBUG_TRACE: "false"
   artifacts:
     paths:
-      - deb/*
       - repo/*
     expire_in: 4 days
 

backup/Makefile

-#
-#  Makefile for the backup package
-#
-test:
-	@echo "I: No tests available for this package"
-
-clean:
-	$(RM) -r ./debian/symbiosis-backup/usr/share/lintian/overrides
-
-all:
-	mkdir -p ./debian/symbiosis-backup/usr/share/lintian/overrides || true
-	cp debian/lintian-overrides ./debian/symbiosis-backup/usr/share/lintian/overrides/symbiosis-backup
-
-.PHONY: clean all test

backup/debian/bug-control

-Submit-As: symbiosis
-Send-To: projects.bytemark.co.uk

backup/debian/changelog

+sympl-backup (2019:0529) stable; urgency=medium
+
+  * Renamed package to sympl-backup
+
+ -- Paul Cammish <sympl@kelduum.net>  Wed, 29 May 2019 13:40:00 +0100
+
 symbiosis-backup (2018:0820) stable; urgency=medium
 
   * Prevented *.lock from being synced to backup space.

backup/debian/control

-Source: symbiosis-backup
+Source: sympl-backup
 Section: web
 Priority: extra
-Maintainer: James Carter <jcarter@bytemark.co.uk>
-Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>, Steve Kemp <steve@bytemark.co.uk>
+Maintainer: Paul Cammish <sympl@kelduum.net>
+Uploaders: Paul Cammish <sympl@kelduum.net>
 Build-Depends: debhelper (>= 7.0.0), gem2deb
 Standards-Version: 3.9.6
 XS-Ruby-Versions: all
 
-Package: symbiosis-backup
+Package: sympl-backup
 Architecture: all
-Depends: backup2l, ruby, symbiosis-common (>= 2014:0113), make, libfilesys-df-perl,libswitch-perl, ${misc:Depends}
+Depends: backup2l, ruby, sympl-common, make, libfilesys-df-perl,libswitch-perl, ${misc:Depends}
+Replaces: symbiosis-backup
+Breaks:  symbiosis-backup
+Provides: symbiosis-backup
+Conflicts: symbiosis-backup
 Description: Automatically backup your files
  This package configures backup2l to backup your data.
  .

backup/debian/copyright

 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Bytemark Symbiosis
-Source: https://github.com/BytemarkHosting/symbiosis
+Upstream-Name: Sympl
+Source: https://github.mythic-beasts.com/sympl/sympl-stretch
 
 
 Files: *
-Copyright: 2008-2017, Bytemark Ltd
+Copyright: 2019, The Sympl Project
 License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public

backup/debian/lintian-overrides

-symbiosis-backup: non-standard-dir-in-var var/backups/
+sympl-backup: non-standard-dir-in-var var/backups/

backup/debian/postinst

@@ -35,9 +35,9 @@ cd /etc/symbiosis/backup.d/ && make
 #
 ######################################
 
-package="symbiosis-backup"
+package="sympl-backup"
 ourfile="/etc/symbiosis/backup.d/backup2l.conf" 
-theirfile="$conf.dpkg-symbiosis-orig"
+theirfile="$conf.dpkg-sympl-orig"
 
 #
 # Add the diversion, if it doesn't exist.

backup/debian/prerm

@@ -7,8 +7,8 @@ set -e
 #
 file="/etc/backup2l.conf"
 ourfile="/etc/symbiosis/backup.d/backup2l.conf" 
-theirfile="$file.dpkg-symbiosis-orig"
-package="symbiosis-backup"
+theirfile="$file.dpkg-sympl-orig"
+package="sympl-backup"
 
 if [ ! -L "$file" ] || \
    [ "$(readlink "$file")" != "$ourfile" -a \

common/debian/bug-control

-Submit-As: symbiosis
-Send-To: projects.bytemark.co.uk

common/debian/changelog

+sympl-common (0.01) stable; urgency=medium
+
+  * Rename package to sympl-common.
+
+ -- Paul Cammish <sympl@kelduum.net>  Wed 29, May 2019 13:57 +0100
+
 symbiosis-common (2018:0616) stable; urgency=medium
 
   * Rename deprecated 'File.exists?' call to 'File.exist?' in 'config_file.rb'. 

common/debian/control

-Source: symbiosis-common
+Source: sympl-common
 Section: web
 Priority: extra
-Maintainer: James Carter <jcarter@bytemark.co.uk>
-Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>, Steve Kemp <steve@bytemark.co.uk>
+Maintainer: Paul Cammish <sympl@kelduum.net>
+Uploaders: Paul Cammish <sympl@kelduum.net>
 Build-Depends: debhelper (>= 7.0.0), gem2deb, txt2man, dh-systemd
 Standards-Version: 3.9.6
 XS-Ruby-Versions: all
 
-Package: symbiosis-common
+Package: sympl-common
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ruby | ruby-interpreter, ruby-json-jwt, ruby-password, ruby-diffy, ruby-erubis, ruby-mocha, ruby-webmock, ruby-test-unit, ruby-faraday, gnutls-bin, gcc, openssl, sudo, adduser, ssl-cert, debconf-utils, ${misc:Depends}
-Replaces: symbiosis-firewall (<< 2011:1214), symbiosis-range, symbiosis-test, bytemark-vhost-range, bytemark-vhost-test, symbiosis-crack
-Breaks: symbiosis-firewall (<< 2011:1214), symbiosis-email (<< 2012:0215)
-Conflicts: symbiosis-range, symbiosis-test, symbiosis-crack, bytemark-vhost-range, bytemark-vhost-test, symbiosis-email (<< 2012:0215)
-Provides: symbiosis-range, bytemark-vhost-range, symbiosis-crack
-Description: Common library functions for Bytemark Symbiosis
- This package contains shared code and scripts for use by the
- Symbiosis system.
+Replaces: symbiosis-common, symbiosis-firewall, symbiosis-range, symbiosis-test, bytemark-vhost-range, bytemark-vhost-test, symbiosis-crack
+Breaks: symbiosis-common, symbiosis-firewall, symbiosis-email
+Conflicts: symbiosis-common, symbiosis-range, symbiosis-test, symbiosis-crack, bytemark-vhost-range, bytemark-vhost-test, symbiosis-email
+Provides: symbiosis-common, symbiosis-range, bytemark-vhost-range, symbiosis-crack
+Description: Common library functions for Sympl
+ This package contains shared code and scripts for use by the Sympl system.
  .

common/debian/copyright

 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Bytemark Symbiosis
-Source: https://github.com/BytemarkHosting/symbiosis
+Upstream-Name: Sympl
+Source: https://github.mythic-beasts.com/sympl/sympl-debian
 
 
 Files: *
-Copyright: 2008-2017, Bytemark Ltd
+Copyright: 2019, The Sympl Project
 License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public

common/debian/postinst

@@ -29,7 +29,7 @@ shadowconfig on
 if ( ! grep ^admin: /etc/passwd 2>/dev/null >/dev/null ); then
 
   echo "Adding 'admin' account"
-  adduser --home=/srv --shell=/bin/bash --no-create-home --disabled-login --gecos='Symbiosis Administrator,,,' admin
+  adduser --home=/srv --shell=/bin/bash --no-create-home --disabled-login --gecos='Sympl Administrator,,,' admin
 
   #
   #  Now set the password for admin to that used by root if it isn't there

meta/debian/changelog → core/debian/changelog

+sympl-core (2019:0529) stable; urgency=medium
+
+  * Renamed package to sympl-core
+
+ -- Paul Cammish <sympl@kelduum.net>  Wed, 29 May 2019 15:05 +0100
+
 bytemark-symbiosis (2017:0818) stable; urgency=medium
 
   * Added systemd unit to output Symbiosis logo on boot.

meta/debian/control → core/debian/control

-Source: bytemark-symbiosis
+Source: sympl-core
 Section: web
 Priority: extra
-Maintainer: James Carter <jcarter@bytemark.co.uk>
-Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>, Steve Kemp <steve@bytemark.co.uk>
+Maintainer: Paul Cammish <sympl@kelduum.net>
+Uploaders: Paul Cammish <sympl@kelduum.net>
 Build-Depends: debhelper (>= 7.0.0), dh-systemd
 Standards-Version: 3.9.6
 
-Package: bytemark-symbiosis
+Package: sympl-core
 Architecture: all
-Depends: symbiosis-updater (>= 2014:0113),
+Depends: sympl-updater,
   lsb-base (>= 3.0-6),
   libpam-modules,
   ruby,
   python,
   python-apt,
   ${misc:Depends}
-Recommends: symbiosis-backup (>= 2014:0113),
-  symbiosis-common (>= 2014:0113),
-  symbiosis-cron (>= 2014:0113),
-  symbiosis-email (>= 2014:0113),
-  symbiosis-firewall (>= 2014:0113),
-  symbiosis-ftpd (>= 2014:0113),
-  symbiosis-httpd (>= 2014:0113),
-  symbiosis-monit (>= 2014:0113),
-  symbiosis-mysql (>= 2014:0113),
-  symbiosis-pam (>= 2014:0113),
-  symbiosis-phpmyadmin (>= 2014:0113),
-  symbiosis-dns (>= 2014:0113),
-  symbiosis-webmail (>= 2014:0113),
-  symbiosis-xmpp (>= 2014:0113),
+Recommends: sympl-backup,
+  sympl-common,
+  sympl-cron,
+  sympl-email,
+  sympl-firewall,
+  sympl-ftpd,
+  sympl-httpd,
+  sympl-monit,
+  sympl-mysql,
+  sympl-pam,
+  sympl-phpmyadmin,
+  sympl-dns,
+  sympl-webmail,
   openssh-server
 Description: Easy, complete, and Debian-friendly server administration system
  This package is a metapackage which will pull in each package which
- is a component of the Bytemark Symbiosis system.
+ is a component of the Sympl system.
  .
  Installing this package will completely configure your system for
  the virtual hosting of multiple domains with:
@@ -41,10 +40,10 @@ Description: Easy, complete, and Debian-friendly server administration system
   * FTP hosting.
   * Email hosting (and webmail).
 
-Package: symbiosis-pam
+Package: sympl-pam
 Architecture: all
 Depends: libpam-tmpdir, wbritish | wordlist, libpam-cracklib, ${misc:Depends}
-Description: PAM configuration metapackage for Sybmbiosis
+Description: PAM configuration metapackage for Sympl
  This is a metapackage which depends on the various PAM modules to help
  maintain your machine's security.
  .

meta/debian/copyright → core/debian/copyright

 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Bytemark Symbiosis
-Source: https://github.com/BytemarkHosting/symbiosis
+Upstream-Name: Sympl
+Source: https://github.mythic-beasts.com/sympl/sympl_stretch
 
 Files: *
-Copyright: 2008-2017, Bytemark Ltd
+Copyright: 2019, The Sympl Project
 License: GPL-2+
 
 Files: debian/bytemark-symbiosis.init update-motd.d/00-bytemark-symbiosis