backup server in BlueGit: imports naar internal/backupserver, integratietests bouwen BlueGit uit dezelfde checkout, AUR bluegit-backup vanuit timfa/bluegit
@@ -19,8 +19,8 @@ import (
19
19
"syscall"
20
20
"time"
21
21
22
"git.timfalken.com/timfa/bluegit-backup/internal/config"
23
"git.timfalken.com/timfa/bluegit-backup/internal/server"
22
"gitlab.com/Timfa/bluegit/internal/backupserver/config"
23
"gitlab.com/Timfa/bluegit/internal/backupserver/server"
24
24
)
25
25
26
26
func usage() {
@@ -86,7 +86,7 @@ func main() {
86
86
err = printToken(os.Args[2:])
87
87
case "example-config":
88
88
fmt.Print(config.Example())
89
case "version":
89
case "version", "--version":
90
90
fmt.Println(server.Version)
91
91
default:
92
92
usage()
@@ -19,8 +19,8 @@ import (19
"syscall"19
"syscall"20
"time"20
"time"21
21
22
"git.timfalken.com/timfa/bluegit-backup/internal/config"22
"gitlab.com/Timfa/bluegit/internal/backupserver/config"23
"git.timfalken.com/timfa/bluegit-backup/internal/server"23
"gitlab.com/Timfa/bluegit/internal/backupserver/server"24
)24
)25
25
26
func usage() {26
func usage() {@@ -86,7 +86,7 @@ func main() {86
err = printToken(os.Args[2:])86
err = printToken(os.Args[2:])87
case "example-config":87
case "example-config":88
fmt.Print(config.Example())88
fmt.Print(config.Example())89
case "version":89
case "version", "--version":90
fmt.Println(server.Version)90
fmt.Println(server.Version)91
default:91
default:92
usage()92
usage()@@ -19,7 +19,7 @@ import (
19
19
"strings"
20
20
"time"
21
21
22
"git.timfalken.com/timfa/bluegit-backup/internal/protocol"
22
"gitlab.com/Timfa/bluegit/internal/backupserver/protocol"
23
23
)
24
24
25
25
var nameRE = regexp.MustCompile(`^bluegit-\d{8}-\d{6}(-\d{1,3})?\.tar\.gz$`)
@@ -19,7 +19,7 @@ import (19
"strings"19
"strings"20
"time"20
"time"21
21
22
"git.timfalken.com/timfa/bluegit-backup/internal/protocol"22
"gitlab.com/Timfa/bluegit/internal/backupserver/protocol"23
)23
)24
24
25
var nameRE = regexp.MustCompile(`^bluegit-\d{8}-\d{6}(-\d{1,3})?\.tar\.gz$`)25
var nameRE = regexp.MustCompile(`^bluegit-\d{8}-\d{6}(-\d{1,3})?\.tar\.gz$`)@@ -15,8 +15,8 @@ import (
15
15
"testing"
16
16
"time"
17
17
18
"git.timfalken.com/timfa/bluegit-backup/internal/config"
19
"git.timfalken.com/timfa/bluegit-backup/internal/server"
18
"gitlab.com/Timfa/bluegit/internal/backupserver/config"
19
"gitlab.com/Timfa/bluegit/internal/backupserver/server"
20
20
)
21
21
22
22
// Feature: Backupserver-Key in BlueGit genereren en de backup server koppelen.
@@ -457,7 +457,7 @@ func TestNewInstanceRestore(t *testing.T) {
457
457
// Feature: de CLI vraagt de keuze bij een nieuwe verbinding.
458
458
func TestCLIConnectAsksOnConflict(t *testing.T) {
459
459
cli := filepath.Join(t.TempDir(), "bluegit-backup")
460
if out, err := exec.Command("go", "build", "-o", cli, "../cmd/bluegit-backup").CombinedOutput(); err != nil {
460
if out, err := exec.Command("go", "build", "-o", cli, "../../../cmd/bluegit-backup").CombinedOutput(); err != nil {
461
461
t.Fatalf("build: %v %s", err, out)
462
462
}
463
463
a := startBlueGit(t)
@@ -15,8 +15,8 @@ import (15
"testing"15
"testing"16
"time"16
"time"17
17
18
"git.timfalken.com/timfa/bluegit-backup/internal/config"18
"gitlab.com/Timfa/bluegit/internal/backupserver/config"19
"git.timfalken.com/timfa/bluegit-backup/internal/server"19
"gitlab.com/Timfa/bluegit/internal/backupserver/server"20
)20
)21
21
22
// Feature: Backupserver-Key in BlueGit genereren en de backup server koppelen.22
// Feature: Backupserver-Key in BlueGit genereren en de backup server koppelen.@@ -457,7 +457,7 @@ func TestNewInstanceRestore(t *testing.T) {457
// Feature: de CLI vraagt de keuze bij een nieuwe verbinding.457
// Feature: de CLI vraagt de keuze bij een nieuwe verbinding.458
func TestCLIConnectAsksOnConflict(t *testing.T) {458
func TestCLIConnectAsksOnConflict(t *testing.T) {459
cli := filepath.Join(t.TempDir(), "bluegit-backup")459
cli := filepath.Join(t.TempDir(), "bluegit-backup")460
if out, err := exec.Command("go", "build", "-o", cli, "../cmd/bluegit-backup").CombinedOutput(); err != nil {460
if out, err := exec.Command("go", "build", "-o", cli, "../../../cmd/bluegit-backup").CombinedOutput(); err != nil {461
t.Fatalf("build: %v %s", err, out)461
t.Fatalf("build: %v %s", err, out)462
}462
}463
a := startBlueGit(t)463
a := startBlueGit(t)@@ -8,8 +8,8 @@ import (
8
8
"testing"
9
9
"time"
10
10
11
"git.timfalken.com/timfa/bluegit-backup/internal/protocol"
12
"git.timfalken.com/timfa/bluegit-backup/internal/server"
11
"gitlab.com/Timfa/bluegit/internal/backupserver/protocol"
12
"gitlab.com/Timfa/bluegit/internal/backupserver/server"
13
13
)
14
14
15
15
// setBackupProtocol bootst een andere versie van de backup server na (die
@@ -98,7 +98,7 @@ func TestCompatBlueGitTooOld(t *testing.T) {
98
98
99
99
// Feature: BlueGit vraagt een nieuwer protocol dan de backup server spreekt
100
100
// ("backup te oud"). Nagebootst met een test-build van BlueGit met protocol
101
// 99 (-ldflags -X, scripts/build-bluegit.sh). Koppelen lukt, zodat het
101
// 99 (-ldflags -X, TestMain in harness_test.go). Koppelen lukt, zodat het
102
102
// zichtbaar wordt; BlueGit weigert gegevens (426), de backup server weigert
103
103
// te synchroniseren, beheerders zien de banner en andere gebruikers niet.
104
104
func TestCompatBackupTooOld(t *testing.T) {
@@ -8,8 +8,8 @@ import (8
"testing"8
"testing"9
"time"9
"time"10
10
11
"git.timfalken.com/timfa/bluegit-backup/internal/protocol"11
"gitlab.com/Timfa/bluegit/internal/backupserver/protocol"12
"git.timfalken.com/timfa/bluegit-backup/internal/server"12
"gitlab.com/Timfa/bluegit/internal/backupserver/server"13
)13
)14
14
15
// setBackupProtocol bootst een andere versie van de backup server na (die15
// setBackupProtocol bootst een andere versie van de backup server na (die@@ -98,7 +98,7 @@ func TestCompatBlueGitTooOld(t *testing.T) {98
98
99
// Feature: BlueGit vraagt een nieuwer protocol dan de backup server spreekt99
// Feature: BlueGit vraagt een nieuwer protocol dan de backup server spreekt100
// ("backup te oud"). Nagebootst met een test-build van BlueGit met protocol100
// ("backup te oud"). Nagebootst met een test-build van BlueGit met protocol101
// 99 (-ldflags -X, scripts/build-bluegit.sh). Koppelen lukt, zodat het101
// 99 (-ldflags -X, TestMain in harness_test.go). Koppelen lukt, zodat het102
// zichtbaar wordt; BlueGit weigert gegevens (426), de backup server weigert102
// zichtbaar wordt; BlueGit weigert gegevens (426), de backup server weigert103
// te synchroniseren, beheerders zien de banner en andere gebruikers niet.103
// te synchroniseren, beheerders zien de banner en andere gebruikers niet.104
func TestCompatBackupTooOld(t *testing.T) {104
func TestCompatBackupTooOld(t *testing.T) {@@ -1,9 +1,11 @@
1
1
//go:build integration
2
2
3
// Integratietests: elke test start een echte BlueGit (BLUEGIT_BIN), maakt
4
// daar een beheerder, token en Backupserver-Key aan, en test de backup
5
// server ertegen. Zonder BLUEGIT_BIN falen ze; ze slaan niet over, zodat de
6
// release-jobs nooit op een overgeslagen test kunnen leunen.
3
// Integratietests: elke test start een echte BlueGit, maakt daar een
4
// beheerder, token en Backupserver-Key aan, en test de backup server
5
// ertegen. TestMain bouwt BlueGit uit dezelfde checkout (./cmd/bluegit),
6
// tenzij BLUEGIT_BIN al naar een binary wijst. Lukt de bouw niet, dan
7
// falen alle tests; ze slaan niet over, zodat de release-jobs nooit op een
8
// overgeslagen test kunnen leunen.
7
9
package integration
8
10
9
11
import (
@@ -25,15 +27,66 @@ import (
25
27
"testing"
26
28
"time"
27
29
28
"git.timfalken.com/timfa/bluegit-backup/internal/config"
29
"git.timfalken.com/timfa/bluegit-backup/internal/server"
30
"gitlab.com/Timfa/bluegit/internal/backupserver/config"
31
"gitlab.com/Timfa/bluegit/internal/backupserver/server"
30
32
)
31
33
34
// FutureProtocol is het protocol van de test-build bluegit-future.
35
const FutureProtocol = 99
36
37
// buildErr is de fout van TestMain bij het bouwen; elke test faalt dan.
38
var buildErr error
39
40
// TestMain bouwt bluegit en bluegit-future uit deze checkout, als
41
// BLUEGIT_BIN niet gezet is. bluegit-future is dezelfde BlueGit met
42
// protocol FutureProtocol, die alleen backup servers vanaf FutureProtocol
43
// ondersteunt (de test "backup server te oud").
44
func TestMain(m *testing.M) {
45
var tmp string
46
if os.Getenv("BLUEGIT_BIN") == "" {
47
var err error
48
tmp, err = os.MkdirTemp("", "bluegit-it-")
49
if err == nil {
50
err = buildBlueGit(tmp)
51
}
52
buildErr = err
53
}
54
code := m.Run()
55
if tmp != "" {
56
_ = os.RemoveAll(tmp)
57
}
58
os.Exit(code)
59
}
60
61
func buildBlueGit(dir string) error {
62
root, err := filepath.Abs(filepath.Join("..", "..", ".."))
63
if err != nil {
64
return err
65
}
66
bin := filepath.Join(dir, "bluegit")
67
pkg := "gitlab.com/Timfa/bluegit/internal/backup"
68
for _, b := range []struct{ out, ldflags string }{
69
{bin, ""},
70
{bin + "-future", fmt.Sprintf("-X %s.protocolVersion=%d -X %s.minBackupProtocol=%d", pkg, FutureProtocol, pkg, FutureProtocol)},
71
} {
72
cmd := exec.Command("go", "build", "-trimpath", "-ldflags", b.ldflags, "-o", b.out, "./cmd/bluegit")
73
cmd.Dir = root
74
cmd.Env = append(os.Environ(), "CGO_ENABLED=0")
75
if out, err := cmd.CombinedOutput(); err != nil {
76
return fmt.Errorf("go build %s: %v\n%s", filepath.Base(b.out), err, out)
77
}
78
}
79
return os.Setenv("BLUEGIT_BIN", bin)
80
}
81
32
82
func bluegitBin(t *testing.T) string {
33
83
t.Helper()
84
if buildErr != nil {
85
t.Fatalf("BlueGit bouwen: %v", buildErr)
86
}
34
87
bin := os.Getenv("BLUEGIT_BIN")
35
88
if bin == "" {
36
t.Fatal("BLUEGIT_BIN ontbreekt: bouw BlueGit met scripts/build-bluegit.sh")
89
t.Fatal("BLUEGIT_BIN ontbreekt")
37
90
}
38
91
if _, err := os.Stat(bin); err != nil {
39
92
t.Fatalf("BLUEGIT_BIN: %v", err)
@@ -92,9 +145,9 @@ func startBlueGit(t *testing.T) *BlueGit {
92
145
}
93
146
94
147
// bluegitFutureBin is een test-build van dezelfde BlueGit met een hoger
95
// protocol (scripts/build-bluegit.sh bouwt hem naast BLUEGIT_BIN met
96
// -ldflags -X): protocol FutureProtocol, en hij ondersteunt alleen backup
97
// servers vanaf FutureProtocol.
148
// protocol (TestMain bouwt hem naast BLUEGIT_BIN met -ldflags -X):
149
// protocol FutureProtocol, en hij ondersteunt alleen backup servers vanaf
150
// FutureProtocol.
98
151
func bluegitFutureBin(t *testing.T) string {
99
152
t.Helper()
100
153
bin := os.Getenv("BLUEGIT_FUTURE_BIN")
@@ -102,14 +155,11 @@ func bluegitFutureBin(t *testing.T) string {
102
155
bin = filepath.Join(filepath.Dir(bluegitBin(t)), "bluegit-future")
103
156
}
104
157
if _, err := os.Stat(bin); err != nil {
105
t.Fatalf("test-build met hoger protocol ontbreekt (scripts/build-bluegit.sh): %v", err)
158
t.Fatalf("test-build met hoger protocol ontbreekt (BLUEGIT_FUTURE_BIN of bluegit-future naast BLUEGIT_BIN): %v", err)
106
159
}
107
160
return bin
108
161
}
109
162
110
// FutureProtocol staat ook in scripts/build-bluegit.sh.
111
const FutureProtocol = 99
112
113
163
func startBlueGitBin(t *testing.T, bin string) *BlueGit {
114
164
t.Helper()
115
165
dir := t.TempDir()
@@ -1,9 +1,11 @@1
//go:build integration1
//go:build integration2
2
3
// Integratietests: elke test start een echte BlueGit (BLUEGIT_BIN), maakt3
// Integratietests: elke test start een echte BlueGit, maakt daar een4
// daar een beheerder, token en Backupserver-Key aan, en test de backup4
// beheerder, token en Backupserver-Key aan, en test de backup server5
// server ertegen. Zonder BLUEGIT_BIN falen ze; ze slaan niet over, zodat de5
// ertegen. TestMain bouwt BlueGit uit dezelfde checkout (./cmd/bluegit),6
// release-jobs nooit op een overgeslagen test kunnen leunen.6
// tenzij BLUEGIT_BIN al naar een binary wijst. Lukt de bouw niet, dan7
// falen alle tests; ze slaan niet over, zodat de release-jobs nooit op een8
// overgeslagen test kunnen leunen.7
package integration9
package integration8
10
9
import (11
import (@@ -25,15 +27,66 @@ import (25
"testing"27
"testing"26
"time"28
"time"27
29
28
"git.timfalken.com/timfa/bluegit-backup/internal/config"30
"gitlab.com/Timfa/bluegit/internal/backupserver/config"29
"git.timfalken.com/timfa/bluegit-backup/internal/server"31
"gitlab.com/Timfa/bluegit/internal/backupserver/server"30
)32
)31
33
34
// FutureProtocol is het protocol van de test-build bluegit-future.35
const FutureProtocol = 9936
37
// buildErr is de fout van TestMain bij het bouwen; elke test faalt dan.38
var buildErr error39
40
// TestMain bouwt bluegit en bluegit-future uit deze checkout, als41
// BLUEGIT_BIN niet gezet is. bluegit-future is dezelfde BlueGit met42
// protocol FutureProtocol, die alleen backup servers vanaf FutureProtocol43
// ondersteunt (de test "backup server te oud").44
func TestMain(m *testing.M) {45
var tmp string46
if os.Getenv("BLUEGIT_BIN") == "" {47
var err error48
tmp, err = os.MkdirTemp("", "bluegit-it-")49
if err == nil {50
err = buildBlueGit(tmp)51
}52
buildErr = err53
}54
code := m.Run()55
if tmp != "" {56
_ = os.RemoveAll(tmp)57
}58
os.Exit(code)59
}60
61
func buildBlueGit(dir string) error {62
root, err := filepath.Abs(filepath.Join("..", "..", ".."))63
if err != nil {64
return err65
}66
bin := filepath.Join(dir, "bluegit")67
pkg := "gitlab.com/Timfa/bluegit/internal/backup"68
for _, b := range []struct{ out, ldflags string }{69
{bin, ""},70
{bin + "-future", fmt.Sprintf("-X %s.protocolVersion=%d -X %s.minBackupProtocol=%d", pkg, FutureProtocol, pkg, FutureProtocol)},71
} {72
cmd := exec.Command("go", "build", "-trimpath", "-ldflags", b.ldflags, "-o", b.out, "./cmd/bluegit")73
cmd.Dir = root74
cmd.Env = append(os.Environ(), "CGO_ENABLED=0")75
if out, err := cmd.CombinedOutput(); err != nil {76
return fmt.Errorf("go build %s: %v\n%s", filepath.Base(b.out), err, out)77
}78
}79
return os.Setenv("BLUEGIT_BIN", bin)80
}81
32
func bluegitBin(t *testing.T) string {82
func bluegitBin(t *testing.T) string {33
t.Helper()83
t.Helper()84
if buildErr != nil {85
t.Fatalf("BlueGit bouwen: %v", buildErr)86
}34
bin := os.Getenv("BLUEGIT_BIN")87
bin := os.Getenv("BLUEGIT_BIN")35
if bin == "" {88
if bin == "" {36
t.Fatal("BLUEGIT_BIN ontbreekt: bouw BlueGit met scripts/build-bluegit.sh")89
t.Fatal("BLUEGIT_BIN ontbreekt")37
}90
}38
if _, err := os.Stat(bin); err != nil {91
if _, err := os.Stat(bin); err != nil {39
t.Fatalf("BLUEGIT_BIN: %v", err)92
t.Fatalf("BLUEGIT_BIN: %v", err)@@ -92,9 +145,9 @@ func startBlueGit(t *testing.T) *BlueGit {92
}145
}93
146
94
// bluegitFutureBin is een test-build van dezelfde BlueGit met een hoger147
// bluegitFutureBin is een test-build van dezelfde BlueGit met een hoger95
// protocol (scripts/build-bluegit.sh bouwt hem naast BLUEGIT_BIN met148
// protocol (TestMain bouwt hem naast BLUEGIT_BIN met -ldflags -X):96
// -ldflags -X): protocol FutureProtocol, en hij ondersteunt alleen backup149
// protocol FutureProtocol, en hij ondersteunt alleen backup servers vanaf97
// servers vanaf FutureProtocol.150
// FutureProtocol.98
func bluegitFutureBin(t *testing.T) string {151
func bluegitFutureBin(t *testing.T) string {99
t.Helper()152
t.Helper()100
bin := os.Getenv("BLUEGIT_FUTURE_BIN")153
bin := os.Getenv("BLUEGIT_FUTURE_BIN")@@ -102,14 +155,11 @@ func bluegitFutureBin(t *testing.T) string {102
bin = filepath.Join(filepath.Dir(bluegitBin(t)), "bluegit-future")155
bin = filepath.Join(filepath.Dir(bluegitBin(t)), "bluegit-future")103
}156
}104
if _, err := os.Stat(bin); err != nil {157
if _, err := os.Stat(bin); err != nil {105
t.Fatalf("test-build met hoger protocol ontbreekt (scripts/build-bluegit.sh): %v", err)158
t.Fatalf("test-build met hoger protocol ontbreekt (BLUEGIT_FUTURE_BIN of bluegit-future naast BLUEGIT_BIN): %v", err)106
}159
}107
return bin160
return bin108
}161
}109
162
110
// FutureProtocol staat ook in scripts/build-bluegit.sh.111
const FutureProtocol = 99112
113
func startBlueGitBin(t *testing.T, bin string) *BlueGit {163
func startBlueGitBin(t *testing.T, bin string) *BlueGit {114
t.Helper()164
t.Helper()115
dir := t.TempDir()165
dir := t.TempDir()@@ -15,7 +15,7 @@ import (
15
15
"strings"
16
16
"time"
17
17
18
"git.timfalken.com/timfa/bluegit-backup/internal/protocol"
18
"gitlab.com/Timfa/bluegit/internal/backupserver/protocol"
19
19
)
20
20
21
21
// Mirror is de draaiende kopie: Dir bevat de logische paden (state/…,
@@ -15,7 +15,7 @@ import (15
"strings"15
"strings"16
"time"16
"time"17
17
18
"git.timfalken.com/timfa/bluegit-backup/internal/protocol"18
"gitlab.com/Timfa/bluegit/internal/backupserver/protocol"19
)19
)20
20
21
// Mirror is de draaiende kopie: Dir bevat de logische paden (state/…,21
// Mirror is de draaiende kopie: Dir bevat de logische paden (state/…,@@ -13,8 +13,8 @@ import (
13
13
"strings"
14
14
"time"
15
15
16
"git.timfalken.com/timfa/bluegit-backup/internal/protocol"
17
"git.timfalken.com/timfa/bluegit-backup/internal/throttle"
16
"gitlab.com/Timfa/bluegit/internal/backupserver/protocol"
17
"gitlab.com/Timfa/bluegit/internal/backupserver/throttle"
18
18
)
19
19
20
20
// ErrGone betekent dat een bestand tussen manifest en download verdween.
@@ -13,8 +13,8 @@ import (13
"strings"13
"strings"14
"time"14
"time"15
15
16
"git.timfalken.com/timfa/bluegit-backup/internal/protocol"16
"gitlab.com/Timfa/bluegit/internal/backupserver/protocol"17
"git.timfalken.com/timfa/bluegit-backup/internal/throttle"17
"gitlab.com/Timfa/bluegit/internal/backupserver/throttle"18
)18
)19
19
20
// ErrGone betekent dat een bestand tussen manifest en download verdween.20
// ErrGone betekent dat een bestand tussen manifest en download verdween.@@ -12,10 +12,10 @@ import (
12
12
"strconv"
13
13
"strings"
14
14
15
"git.timfalken.com/timfa/bluegit-backup/internal/archive"
16
"git.timfalken.com/timfa/bluegit-backup/internal/config"
17
"git.timfalken.com/timfa/bluegit-backup/internal/mirror"
18
"git.timfalken.com/timfa/bluegit-backup/internal/protocol"
15
"gitlab.com/Timfa/bluegit/internal/backupserver/archive"
16
"gitlab.com/Timfa/bluegit/internal/backupserver/config"
17
"gitlab.com/Timfa/bluegit/internal/backupserver/mirror"
18
"gitlab.com/Timfa/bluegit/internal/backupserver/protocol"
19
19
)
20
20
21
21
// Input is de invoer van een actie: JSON-velden, querystring, formulier of
@@ -12,10 +12,10 @@ import (12
"strconv"12
"strconv"13
"strings"13
"strings"14
14
15
"git.timfalken.com/timfa/bluegit-backup/internal/archive"15
"gitlab.com/Timfa/bluegit/internal/backupserver/archive"16
"git.timfalken.com/timfa/bluegit-backup/internal/config"16
"gitlab.com/Timfa/bluegit/internal/backupserver/config"17
"git.timfalken.com/timfa/bluegit-backup/internal/mirror"17
"gitlab.com/Timfa/bluegit/internal/backupserver/mirror"18
"git.timfalken.com/timfa/bluegit-backup/internal/protocol"18
"gitlab.com/Timfa/bluegit/internal/backupserver/protocol"19
)19
)20
20
21
// Input is de invoer van een actie: JSON-velden, querystring, formulier of21
// Input is de invoer van een actie: JSON-velden, querystring, formulier of@@ -16,11 +16,11 @@ import (
16
16
"sync"
17
17
"time"
18
18
19
"git.timfalken.com/timfa/bluegit-backup/internal/archive"
20
"git.timfalken.com/timfa/bluegit-backup/internal/config"
21
"git.timfalken.com/timfa/bluegit-backup/internal/mirror"
22
"git.timfalken.com/timfa/bluegit-backup/internal/protocol"
23
"git.timfalken.com/timfa/bluegit-backup/internal/throttle"
19
"gitlab.com/Timfa/bluegit/internal/backupserver/archive"
20
"gitlab.com/Timfa/bluegit/internal/backupserver/config"
21
"gitlab.com/Timfa/bluegit/internal/backupserver/mirror"
22
"gitlab.com/Timfa/bluegit/internal/backupserver/protocol"
23
"gitlab.com/Timfa/bluegit/internal/backupserver/throttle"
24
24
)
25
25
26
26
// Version wordt bij het bouwen gezet (-ldflags -X).
@@ -16,11 +16,11 @@ import (16
"sync"16
"sync"17
"time"17
"time"18
18
19
"git.timfalken.com/timfa/bluegit-backup/internal/archive"19
"gitlab.com/Timfa/bluegit/internal/backupserver/archive"20
"git.timfalken.com/timfa/bluegit-backup/internal/config"20
"gitlab.com/Timfa/bluegit/internal/backupserver/config"21
"git.timfalken.com/timfa/bluegit-backup/internal/mirror"21
"gitlab.com/Timfa/bluegit/internal/backupserver/mirror"22
"git.timfalken.com/timfa/bluegit-backup/internal/protocol"22
"gitlab.com/Timfa/bluegit/internal/backupserver/protocol"23
"git.timfalken.com/timfa/bluegit-backup/internal/throttle"23
"gitlab.com/Timfa/bluegit/internal/backupserver/throttle"24
)24
)25
25
26
// Version wordt bij het bouwen gezet (-ldflags -X).26
// Version wordt bij het bouwen gezet (-ldflags -X).@@ -16,8 +16,8 @@ import (
16
16
"testing"
17
17
"time"
18
18
19
"git.timfalken.com/timfa/bluegit-backup/internal/config"
20
"git.timfalken.com/timfa/bluegit-backup/internal/protocol"
19
"gitlab.com/Timfa/bluegit/internal/backupserver/config"
20
"gitlab.com/Timfa/bluegit/internal/backupserver/protocol"
21
21
)
22
22
23
23
// fakeBlueGit is een minimale backup-API met bestanden in het geheugen.
@@ -16,8 +16,8 @@ import (16
"testing"16
"testing"17
"time"17
"time"18
18
19
"git.timfalken.com/timfa/bluegit-backup/internal/config"19
"gitlab.com/Timfa/bluegit/internal/backupserver/config"20
"git.timfalken.com/timfa/bluegit-backup/internal/protocol"20
"gitlab.com/Timfa/bluegit/internal/backupserver/protocol"21
)21
)22
22
23
// fakeBlueGit is een minimale backup-API met bestanden in het geheugen.23
// fakeBlueGit is een minimale backup-API met bestanden in het geheugen.@@ -14,7 +14,7 @@ import (
14
14
"strings"
15
15
"time"
16
16
17
"git.timfalken.com/timfa/bluegit-backup/internal/archive"
17
"gitlab.com/Timfa/bluegit/internal/backupserver/archive"
18
18
)
19
19
20
20
//go:embed web/*
@@ -14,7 +14,7 @@ import (14
"strings"14
"strings"15
"time"15
"time"16
16
17
"git.timfalken.com/timfa/bluegit-backup/internal/archive"17
"gitlab.com/Timfa/bluegit/internal/backupserver/archive"18
)18
)19
19
20
//go:embed web/*20
//go:embed web/*@@ -13,8 +13,8 @@ import (
13
13
"testing"
14
14
"time"
15
15
16
"git.timfalken.com/timfa/bluegit-backup/internal/config"
17
"git.timfalken.com/timfa/bluegit-backup/internal/protocol"
16
"gitlab.com/Timfa/bluegit/internal/backupserver/config"
17
"gitlab.com/Timfa/bluegit/internal/backupserver/protocol"
18
18
)
19
19
20
20
// uiClient is een browser met een cookie.
@@ -13,8 +13,8 @@ import (13
"testing"13
"testing"14
"time"14
"time"15
15
16
"git.timfalken.com/timfa/bluegit-backup/internal/config"16
"gitlab.com/Timfa/bluegit/internal/backupserver/config"17
"git.timfalken.com/timfa/bluegit-backup/internal/protocol"17
"gitlab.com/Timfa/bluegit/internal/backupserver/protocol"18
)18
)19
19
20
// uiClient is een browser met een cookie.20
// uiClient is een browser met een cookie.@@ -4,32 +4,32 @@ pkgver=20261115000000
4
4
pkgrel=1
5
5
pkgdesc='Backup server for a BlueGit instance: incremental copy, archives, rollback'
6
6
arch=('x86_64' 'aarch64')
7
url='https://git.timfalken.com/timfa/bluegit-backup'
7
url='https://git.timfalken.com/timfa/bluegit'
8
8
license=('MIT')
9
9
makedepends=('go')
10
10
backup=('etc/bluegit-backup/config.yml')
11
11
options=('!debug')
12
12
install=bluegit-backup.install
13
13
_commit=0000000000000000000000000000000000000000
14
source=("bluegit-backup-${_commit}.tar.gz::https://git.timfalken.com/timfa/bluegit-backup/-/archive/${_commit}/bluegit-backup-${_commit}.tar.gz")
14
source=("bluegit-${_commit}.tar.gz::https://git.timfalken.com/timfa/bluegit/-/archive/${_commit}/bluegit-${_commit}.tar.gz")
15
15
sha256sums=('SKIP')
16
16
17
17
build() {
18
cd "$srcdir/bluegit-backup-${_commit}"
18
cd "$srcdir/bluegit-${_commit}"
19
19
export CGO_ENABLED=0
20
20
export GOTOOLCHAIN=auto
21
21
export GOFLAGS='-trimpath'
22
22
export GOCACHE="${BUILDDIR:-$srcdir}/gocache"
23
23
export GOPATH="${BUILDDIR:-$srcdir}/gopath"
24
go build -ldflags="-s -w -X git.timfalken.com/timfa/bluegit-backup/internal/server.Version=${pkgver}" -o bluegit-backup ./cmd/bluegit-backup
24
go build -ldflags="-s -w -X gitlab.com/Timfa/bluegit/internal/backupserver/server.Version=${pkgver}" -o bluegit-backup ./cmd/bluegit-backup
25
25
}
26
26
27
27
package() {
28
cd "$srcdir/bluegit-backup-${_commit}"
28
cd "$srcdir/bluegit-${_commit}"
29
29
install -Dm755 bluegit-backup "$pkgdir/usr/bin/bluegit-backup"
30
install -Dm644 packaging/bluegit-backup.service "$pkgdir/usr/lib/systemd/system/bluegit-backup.service"
31
install -Dm644 packaging/config.yml "$pkgdir/etc/bluegit-backup/config.yml"
32
install -Dm644 packaging/sysusers.conf "$pkgdir/usr/lib/sysusers.d/bluegit-backup.conf"
33
install -Dm644 packaging/tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/bluegit-backup.conf"
30
install -Dm644 packaging/backup/bluegit-backup.service "$pkgdir/usr/lib/systemd/system/bluegit-backup.service"
31
install -Dm644 packaging/backup/config.yml "$pkgdir/etc/bluegit-backup/config.yml"
32
install -Dm644 packaging/backup/sysusers.conf "$pkgdir/usr/lib/sysusers.d/bluegit-backup.conf"
33
install -Dm644 packaging/backup/tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/bluegit-backup.conf"
34
34
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
35
35
}
@@ -4,32 +4,32 @@ pkgver=202611150000004
pkgrel=14
pkgrel=15
pkgdesc='Backup server for a BlueGit instance: incremental copy, archives, rollback'5
pkgdesc='Backup server for a BlueGit instance: incremental copy, archives, rollback'6
arch=('x86_64' 'aarch64')6
arch=('x86_64' 'aarch64')7
url='https://git.timfalken.com/timfa/bluegit-backup'7
url='https://git.timfalken.com/timfa/bluegit'8
license=('MIT')8
license=('MIT')9
makedepends=('go')9
makedepends=('go')10
backup=('etc/bluegit-backup/config.yml')10
backup=('etc/bluegit-backup/config.yml')11
options=('!debug')11
options=('!debug')12
install=bluegit-backup.install12
install=bluegit-backup.install13
_commit=000000000000000000000000000000000000000013
_commit=000000000000000000000000000000000000000014
source=("bluegit-backup-${_commit}.tar.gz::https://git.timfalken.com/timfa/bluegit-backup/-/archive/${_commit}/bluegit-backup-${_commit}.tar.gz")14
source=("bluegit-${_commit}.tar.gz::https://git.timfalken.com/timfa/bluegit/-/archive/${_commit}/bluegit-${_commit}.tar.gz")15
sha256sums=('SKIP')15
sha256sums=('SKIP')16
16
17
build() {17
build() {18
cd "$srcdir/bluegit-backup-${_commit}"18
cd "$srcdir/bluegit-${_commit}"19
export CGO_ENABLED=019
export CGO_ENABLED=020
export GOTOOLCHAIN=auto20
export GOTOOLCHAIN=auto21
export GOFLAGS='-trimpath'21
export GOFLAGS='-trimpath'22
export GOCACHE="${BUILDDIR:-$srcdir}/gocache"22
export GOCACHE="${BUILDDIR:-$srcdir}/gocache"23
export GOPATH="${BUILDDIR:-$srcdir}/gopath"23
export GOPATH="${BUILDDIR:-$srcdir}/gopath"24
go build -ldflags="-s -w -X git.timfalken.com/timfa/bluegit-backup/internal/server.Version=${pkgver}" -o bluegit-backup ./cmd/bluegit-backup24
go build -ldflags="-s -w -X gitlab.com/Timfa/bluegit/internal/backupserver/server.Version=${pkgver}" -o bluegit-backup ./cmd/bluegit-backup25
}25
}26
26
27
package() {27
package() {28
cd "$srcdir/bluegit-backup-${_commit}"28
cd "$srcdir/bluegit-${_commit}"29
install -Dm755 bluegit-backup "$pkgdir/usr/bin/bluegit-backup"29
install -Dm755 bluegit-backup "$pkgdir/usr/bin/bluegit-backup"30
install -Dm644 packaging/bluegit-backup.service "$pkgdir/usr/lib/systemd/system/bluegit-backup.service"30
install -Dm644 packaging/backup/bluegit-backup.service "$pkgdir/usr/lib/systemd/system/bluegit-backup.service"31
install -Dm644 packaging/config.yml "$pkgdir/etc/bluegit-backup/config.yml"31
install -Dm644 packaging/backup/config.yml "$pkgdir/etc/bluegit-backup/config.yml"32
install -Dm644 packaging/sysusers.conf "$pkgdir/usr/lib/sysusers.d/bluegit-backup.conf"32
install -Dm644 packaging/backup/sysusers.conf "$pkgdir/usr/lib/sysusers.d/bluegit-backup.conf"33
install -Dm644 packaging/tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/bluegit-backup.conf"33
install -Dm644 packaging/backup/tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/bluegit-backup.conf"34
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"34
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"35
}35
}@@ -1,7 +1,7 @@
1
1
#!/usr/bin/env bash
2
2
# Update an AUR package from the BlueGit source archive of this commit.
3
# AUR_PKG=bluegit (default, packaging/aur) or AUR_PKG=bluegit-runner
4
# (packaging/aur-runner). Pushes ssh://aur@aur.archlinux.org/$AUR_PKG.git
3
# AUR_PKG=bluegit (default, packaging/aur), AUR_PKG=bluegit-runner
4
# (packaging/aur-runner) or AUR_PKG=bluegit-backup (packaging/aur-backup). Pushes ssh://aur@aur.archlinux.org/$AUR_PKG.git
5
5
# master. AUR only accepts master.
6
6
set -euo pipefail
7
7
@@ -94,6 +94,7 @@ PKG="${AUR_PKG:-bluegit}"
94
94
case "$PKG" in
95
95
bluegit) PKGDIR="$ROOT/packaging/aur" ;;
96
96
bluegit-runner) PKGDIR="$ROOT/packaging/aur-runner" ;;
97
bluegit-backup) PKGDIR="$ROOT/packaging/aur-backup" ;;
97
98
*) echo "Unknown AUR_PKG: $PKG" >&2; exit 1 ;;
98
99
esac
99
100
INSTALL_FILE="${PKG}.install"
@@ -1,7 +1,7 @@1
#!/usr/bin/env bash1
#!/usr/bin/env bash2
# Update an AUR package from the BlueGit source archive of this commit.2
# Update an AUR package from the BlueGit source archive of this commit.3
# AUR_PKG=bluegit (default, packaging/aur) or AUR_PKG=bluegit-runner3
# AUR_PKG=bluegit (default, packaging/aur), AUR_PKG=bluegit-runner4
# (packaging/aur-runner). Pushes ssh://aur@aur.archlinux.org/$AUR_PKG.git4
# (packaging/aur-runner) or AUR_PKG=bluegit-backup (packaging/aur-backup). Pushes ssh://aur@aur.archlinux.org/$AUR_PKG.git5
# master. AUR only accepts master.5
# master. AUR only accepts master.6
set -euo pipefail6
set -euo pipefail7
7
@@ -94,6 +94,7 @@ PKG="${AUR_PKG:-bluegit}"94
case "$PKG" in94
case "$PKG" in95
bluegit) PKGDIR="$ROOT/packaging/aur" ;;95
bluegit) PKGDIR="$ROOT/packaging/aur" ;;96
bluegit-runner) PKGDIR="$ROOT/packaging/aur-runner" ;;96
bluegit-runner) PKGDIR="$ROOT/packaging/aur-runner" ;;97
bluegit-backup) PKGDIR="$ROOT/packaging/aur-backup" ;;97
*) echo "Unknown AUR_PKG: $PKG" >&2; exit 1 ;;98
*) echo "Unknown AUR_PKG: $PKG" >&2; exit 1 ;;98
esac99
esac99
INSTALL_FILE="${PKG}.install"100
INSTALL_FILE="${PKG}.install"