Merge branch 'upstream' into internal

dsh2dsh · Oct 18, 2024 · 450aac6 · 450aac6
2 parents 1622f68 + 908807b
commit 450aac6
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -177,14 +177,14 @@ wrapup-and-checksum:
 	tar --mtime='1970-01-01' --sort=name \
 		--transform 's/$(ARTIFACTDIR)/zrepl-$(_ZREPL_VERSION)-noarch/' \
 		--transform 's#dist#zrepl-$(_ZREPL_VERSION)-noarch/dist#' \
-		--transform 's#config/samples#zrepl-$(_ZREPL_VERSION)-noarch/config#' \
+		--transform 's#internal/config/samples#zrepl-$(_ZREPL_VERSION)-noarch/config#' \
 		-acf $(NOARCH_TARBALL) \
 		$(ARTIFACTDIR)/docs/html \
 		$(ARTIFACTDIR)/bash_completion \
 		$(ARTIFACTDIR)/_zrepl.zsh_completion \
 		$(ARTIFACTDIR)/go_env.txt \
 		dist \
-		config/samples
+		internal/config/samples
 	rm -rf "$(ARTIFACTDIR)/release"
 	mkdir -p "$(ARTIFACTDIR)/release"
 	cp -l $(ARTIFACTDIR)/zrepl* \
@@ -282,7 +282,7 @@ cover-platform:
 
 TEST_PLATFORM_BIN_PATH := $(ARTIFACTDIR)/platformtest-$(ZREPL_TARGET_TUPLE)
 test-platform-bin:
-	$(GO_BUILD) -o "$(TEST_PLATFORM_BIN_PATH)" ./platformtest/harness
+	$(GO_BUILD) -o "$(TEST_PLATFORM_BIN_PATH)" ./internal/platformtest/harness
 test-platform:
 	export _TEST_PLATFORM_CMD="\"$(TEST_PLATFORM_BIN_PATH)\""; \
 		$(MAKE) _test-or-cover-platform-impl
@@ -299,7 +299,7 @@ ifndef _TEST_PLATFORM_CMD
 endif
 	rm -f "$(ZREPL_PLATFORMTEST_ZFS_LOG)"
 	rm -f "$(ARTIFACTDIR)/platformtest.cover"
-	platformtest/logmockzfs/logzfsenv "$(ZREPL_PLATFORMTEST_ZFS_LOG)" `which zfs` \
+	internal/platformtest/logmockzfs/logzfsenv "$(ZREPL_PLATFORMTEST_ZFS_LOG)" `which zfs` \
 		$(_TEST_PLATFORM_CMD) \
 		-poolname "$(ZREPL_PLATFORMTEST_POOLNAME)" \
 		-imagepath "$(ZREPL_PLATFORMTEST_IMAGEPATH)" \

diff --git a/docs/conf.py b/docs/conf.py
@@ -181,7 +181,7 @@
 extlinks = {
     'issue':('https://github.com/zrepl/zrepl/issues/%s', 'issue #%s'),
     'repomasterlink':('https://github.com/zrepl/zrepl/blob/master/%s', '%s'),
-    'sampleconf':('https://github.com/zrepl/zrepl/blob/master/config/samples%s', 'config/samples%s'),
+    'sampleconf':('https://github.com/zrepl/zrepl/blob/master/internal/config/samples%s', 'internal/config/samples%s'),
     'commit':('https://github.com/zrepl/zrepl/commit/%s', 'commit %s'),
         }
 
diff --git a/docs/quickstart/backup_to_external_disk.rst b/docs/quickstart/backup_to_external_disk.rst
@@ -31,7 +31,7 @@ A few additional requirements:
 The following config snippet implements the setup described above.
 You will likely want to customize some aspects mentioned in the top comment in the file.
 
-.. literalinclude:: ../../config/samples/quickstart_backup_to_external_disk.yml
+.. literalinclude:: ../../internal/config/samples/quickstart_backup_to_external_disk.yml
 
 
 Offline Backups with two (or more) External Disks
@@ -43,7 +43,7 @@ To accomplish this,
 * create one zpool per external HDD, each with a unique name, and
 * define a pair of ``push`` and ``sink`` job **for each** of these zpools, each with a unique ``name``, ``listener_name``, and ``root_fs``.
 
-The unique names ensure that the jobs don't step on each others' toes when managing :ref:`zrepl's ZFS abstractions <zrepl-zfs-abstractions>` . 
+The unique names ensure that the jobs don't step on each others' toes when managing :ref:`zrepl's ZFS abstractions <zrepl-zfs-abstractions>` .
 
 
-:ref:`Click here <quickstart-apply-config>` to go back to the quickstart guide.
+:ref:`Click here <quickstart-apply-config>` to go back to the quickstart guide.
diff --git a/docs/quickstart/continuous_server_backup.rst b/docs/quickstart/continuous_server_backup.rst
@@ -77,7 +77,7 @@ Configure server ``prod``
 
 We define a **push job** named ``prod_to_backups`` in ``/etc/zrepl/zrepl.yml`` on host ``prod`` :
 
-.. literalinclude:: ../../config/samples/quickstart_continuous_server_backup_sender.yml
+.. literalinclude:: ../../internal/config/samples/quickstart_continuous_server_backup_sender.yml
 
 .. _tutorial-configure-prod:
 
@@ -86,7 +86,7 @@ Configure server ``backups``
 
 We define a corresponding **sink job** named ``sink`` in ``/etc/zrepl/zrepl.yml`` on host ``backups`` :
 
-.. literalinclude:: ../../config/samples/quickstart_continuous_server_backup_receiver.yml
+.. literalinclude:: ../../internal/config/samples/quickstart_continuous_server_backup_receiver.yml
 
 Go Back To Quickstart Guide
 ---------------------------

diff --git a/docs/quickstart/fan_out_replication.rst b/docs/quickstart/fan_out_replication.rst
@@ -80,12 +80,12 @@ Mutual TLS via the :ref:`TLS client authentication transport <transport-tcp+tlsc
 Configure source server A
 -------------------------
 
-.. literalinclude:: ../../config/samples/quickstart_fan_out_replication_source.yml
+.. literalinclude:: ../../internal/config/samples/quickstart_fan_out_replication_source.yml
 
 Configure each target server
 ----------------------------
 
-.. literalinclude:: ../../config/samples/quickstart_fan_out_replication_target.yml
+.. literalinclude:: ../../internal/config/samples/quickstart_fan_out_replication_target.yml
 
 Go Back To Quickstart Guide
 ---------------------------

diff --git a/internal/daemon/job/build_jobs_test.go b/internal/daemon/job/build_jobs_test.go
@@ -111,7 +111,7 @@ jobs:
 }
 
 func TestSampleConfigsAreBuiltWithoutErrors(t *testing.T) {
-	paths, err := filepath.Glob("../../config/samples/*")
+	paths, err := filepath.Glob("../../../internal/config/samples/*")
 	if err != nil {
 		t.Errorf("glob failed: %+v", err)
 	}

diff --git a/internal/daemon/logging/trace/trace_convenience_test.go b/internal/daemon/logging/trace/trace_convenience_test.go
@@ -15,7 +15,7 @@ func TestGetCallerOrPanic(t *testing.T) {
 	}
 	ret := withStackFromCtxMock()
 	// zrepl prefix is stripped
-	assert.Equal(t, "daemon/logging/trace.TestGetCallerOrPanic", ret)
+	assert.Equal(t, "internal/daemon/logging/trace.TestGetCallerOrPanic", ret)
 }
 
 func TestWithTaskGroupRunTasksConcurrently(t *testing.T) {

diff --git a/packaging/deb/debian/rules b/packaging/deb/debian/rules
@@ -34,7 +34,7 @@ override_dh_auto_install:
 	dh_install artifacts/docs/html usr/share/doc/zrepl/docs/
 
 	# install examples
-	dh_install config/samples/* usr/share/doc/zrepl/examples
+	dh_install internal/config/samples/* usr/share/doc/zrepl/examples
 
 	# install default config
 	mkdir -p debian/tmp/etc/zrepl

diff --git a/packaging/rpm/zrepl.spec b/packaging/rpm/zrepl.spec
@@ -49,7 +49,7 @@ install -Dm 0644 artifacts/bash_completion              %{buildroot}%{_datadir}/
 install -Dm 0644 artifacts/rpmbuild/zrepl.yml           %{buildroot}%{_sysconfdir}/zrepl/zrepl.yml
 install -d                                              %{buildroot}%{_datadir}/doc/zrepl
 cp -a   artifacts/docs/html                             %{buildroot}%{_datadir}/doc/zrepl/html
-cp -a   config/samples                                  %{buildroot}%{_datadir}/doc/zrepl/examples
+cp -a   internal/config/samples                         %{buildroot}%{_datadir}/doc/zrepl/examples
 
 %post
 %systemd_post zrepl.service