refactor: Rename all remaining conduwuit references to Continuwuity

Also adds an alias for the old binary name to the dockerfile

Supersedes !1485
Closes #1536
Closes #2277

pkg/continuwuity.service

@@ -3,24 +3,23 @@ Description=Continuwuity - Matrix homeserver
 Documentation=https://continuwuity.org/
 Wants=network-online.target
 After=network-online.target
-Alias=matrix-conduwuit.service
 
 [Service]
 DynamicUser=yes
-User=conduwuit
-Group=conduwuit
+User=continuwuity
+Group=continuwuity
 Type=notify-reload
 ReloadSignal=SIGUSR1
 
 Environment="CONTINUWUITY_LOG_TO_JOURNALD=true"
 Environment="CONTINUWUITY_JOURNALD_IDENTIFIER=%N"
-Environment="CONTINUWUITY_DATABASE_PATH=%S/conduwuit"
+Environment="CONTINUWUITY_DATABASE_PATH=%S/continuwuity"
 Environment="CONTINUWUITY_CONFIG_RELOAD_SIGNAL=true"
 
-LoadCredential=conduwuit.toml:/etc/conduwuit/conduwuit.toml
+LoadCredential=continuwuity.toml:/etc/continuwuity/continuwuity.toml
 RefreshOnReload=yes
 
-ExecStart=/usr/bin/conduwuit --config ${CREDENTIALS_DIRECTORY}/conduwuit.toml
+ExecStart=/usr/bin/continuwuity --config ${CREDENTIALS_DIRECTORY}/continuwuity.toml
 
 AmbientCapabilities=
 CapabilityBoundingSet=
@@ -56,8 +55,8 @@ SystemCallErrorNumber=EPERM
 
 # ConfigurationDirectory isn't specified here because it's created by
 # the distro's package manager.
-StateDirectory=conduwuit
-RuntimeDirectory=conduwuit
+StateDirectory=continuwuity
+RuntimeDirectory=continuwuity
 RuntimeDirectoryMode=0750
 
 Restart=on-failure
@@ -71,3 +70,8 @@ StartLimitBurst=5
 
 [Install]
 WantedBy=multi-user.target
+
+Alias=matrix-continuwuity.service
+Alias=continuwuity.service
+Alias=matrix-conduwuit.service
+Alias=conduwuit.service

pkg/debian/README.md

@@ -28,13 +28,13 @@ See the [generic deployment guide](/deploying/generic.mdx) for additional inform
 
 ## Configuration
 
-After installation, Continuwuity places the example configuration at `/etc/conduwuit/conduwuit.toml` as the default configuration file. The configuration file indicates which settings you must change before starting the service.
+After installation, Continuwuity places the example configuration at `/etc/continuwuity/continuwuity.toml` as the default configuration file. The configuration file indicates which settings you must change before starting the service.
 
-You can customize additional settings by uncommenting and modifying the configuration options in `/etc/conduwuit/conduwuit.toml`.
+You can customize additional settings by uncommenting and modifying the configuration options in `/etc/continuwuity/continuwuity.toml`.
 
 ## Running
 
-The package uses the `conduwuit.service` systemd unit file to start and stop Continuwuity. The binary installs at `/usr/bin/conduwuit`.
+The package uses the `continuwuity.service` systemd unit file to start and stop Continuwuity. The binary installs at `/usr/bin/continuwuity`.
 
 By default, this package assumes that Continuwuity runs behind a reverse proxy. The default configuration options apply (listening on `localhost` and TCP port `6167`). Matrix federation requires a valid domain name and TLS. To federate properly, you must set up TLS certificates and certificate renewal.
 

pkg/debian/config

@@ -6,13 +6,13 @@ set -e
 #. /usr/share/debconf/confmodule
 #
 ## Ask for the Matrix homeserver name, address and port.
-#db_input high conduwuit/hostname || true
+#db_input high continuwuity/hostname || true
 #db_go
 #
-#db_input low conduwuit/address || true
+#db_input low continuwuity/address || true
 #db_go
 #
-#db_input medium conduwuit/port || true
+#db_input medium continuwuity/port || true
 #db_go
 
 exit 0

pkg/debian/postinst

@@ -4,14 +4,14 @@ set -e
 # TODO: implement debconf support that is maintainable without duplicating the config
 #. /usr/share/debconf/confmodule
 
-CONDUWUIT_DATABASE_PATH=/var/lib/conduwuit
-CONDUWUIT_CONFIG_PATH=/etc/conduwuit
+CONTINUWUITY_DATABASE_PATH=/var/lib/continuwuity
+CONTINUWUITY_CONFIG_PATH=/etc/continuwuity
 
 case "$1" in
   configure)
     echo ''
-    echo 'Make sure you edit the example config at /etc/conduwuit/conduwuit.toml before starting!'
-    echo 'To start the server, run: systemctl start conduwuit.service'
+    echo 'Make sure you edit the example config at /etc/continuwuity/continuwuity.toml before starting!'
+    echo 'To start the server, run: systemctl start continuwuity.service'
     echo ''
 
     ;;

pkg/debian/postrm

@@ -3,9 +3,9 @@ set -e
 
 #. /usr/share/debconf/confmodule
 
-CONDUWUIT_CONFIG_PATH=/etc/conduwuit
-CONDUWUIT_DATABASE_PATH=/var/lib/conduwuit
-CONDUWUIT_DATABASE_PATH_SYMLINK=/var/lib/matrix-conduit
+CONTINUWUITY_CONFIG_PATH=/etc/continuwuity
+CONTINUWUITY_DATABASE_PATH=/var/lib/continuwuity
+CONTINUWUITY_DATABASE_PATH_SYMLINK=/var/lib/matrix-conduit
 
 case $1 in
   purge)
@@ -18,17 +18,17 @@ case $1 in
 
     #
 
-    if [ -d "$CONDUWUIT_CONFIG_PATH" ]; then
-      if test -L "$CONDUWUIT_CONFIG_PATH"; then
+    if [ -d "$CONTINUWUITY_CONFIG_PATH" ]; then
+      if test -L "$CONTINUWUITY_CONFIG_PATH"; then
         echo "Deleting continuwuity configuration files"
-        rm -v -r "$CONDUWUIT_CONFIG_PATH"
+        rm -v -r "$CONTINUWUITY_CONFIG_PATH"
       fi
     fi
 
-    if [ -d "$CONDUWUIT_DATABASE_PATH" ]; then
-      if test -L "$CONDUWUIT_DATABASE_PATH"; then
+    if [ -d "$CONTINUWUITY_DATABASE_PATH" ]; then
+      if test -L "$CONTINUWUITY_DATABASE_PATH"; then
         echo "Deleting continuwuity database directory"
-        rm -r "$CONDUWUIT_DATABASE_PATH"
+        rm -r "$CONTINUWUITY_DATABASE_PATH"
       fi
     fi
 

pkg/fedora/continuwuity.spec.rpkg

@@ -23,7 +23,7 @@ Requires:       glibc
 Requires:       libstdc++
 
 %global _description %{expand:
-A Matrix homeserver written in Rust, the official continuation of the conduwuit homeserver.}
+A community-driven Matrix homeserver.}
 
 %description %{_description}
 
@@ -49,9 +49,9 @@ find .cargo/registry/ -executable -name "*.rs" -exec chmod -x {} +
 # {cargo_license -- --no-dev} > LICENSE.dependencies
 
 %install
-install -Dpm0755 target/rpm/conduwuit -t %{buildroot}%{_bindir}
-install -Dpm0644 pkg/conduwuit.service -t %{buildroot}%{_unitdir}
-install -Dpm0600 conduwuit-example.toml %{buildroot}%{_sysconfdir}/conduwuit/conduwuit.toml
+install -Dpm0755 target/rpm/continuwuity -t %{buildroot}%{_bindir}
+install -Dpm0644 pkg/continuwuity.service -t %{buildroot}%{_unitdir}
+install -Dpm0600 continuwuity-example.toml %{buildroot}%{_sysconfdir}/continuwuity/continuwuity.toml
 
 %files
 %license LICENSE
@@ -60,20 +60,20 @@ install -Dpm0600 conduwuit-example.toml %{buildroot}%{_sysconfdir}/conduwuit/con
 %doc CONTRIBUTING.md
 %doc README.md
 %doc SECURITY.md
-%config(noreplace) %{_sysconfdir}/conduwuit/conduwuit.toml
+%config(noreplace) %{_sysconfdir}/continuwuity/continuwuity.toml
 
-%{_bindir}/conduwuit
-%{_unitdir}/conduwuit.service
-# Do not create /var/lib/conduwuit, systemd will create it if necessary
+%{_bindir}/continuwuity
+%{_unitdir}/continuwuity.service
+# Do not create /var/lib/continuwuity, systemd will create it if necessary
 
 %post
-%systemd_post conduwuit.service
+%systemd_post continuwuity.service
 
 %preun
-%systemd_preun conduwuit.service
+%systemd_preun continuwuity.service
 
 %postun
-%systemd_postun_with_restart conduwuit.service
+%systemd_postun_with_restart continuwuity.service
 
 %changelog
 {{{ git_repo_changelog }}}