ziggi/mstore
1
0
Fork 0
Code Pull Requests Actions Packages Projects Releases Wiki Activity

working commit

Browse Source
This commit is contained in:
Олег Бородин
2026-02-14 22:46:32 +02:00
parent 1e03fa349f
commit 73e2b804ff
31 changed files with 597 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
+152 -2
View File
@@ -15,10 +15,10 @@ mstorectl_SOURCES = \
mstored_SOURCES = \
cmd/mstored/main.go
mstorectl$(EXEEXT): $(mstorectl_SOURCES)
mstorectl$(EXEEXT): $(mstorectl_SOURCES) $(EXTRA_mstored_SOURCES)
env CGO_ENABLED=0 $(GO) build $(GOFLAGS) -o mstorectl$(EXEEXT) $(mstorectl_SOURCES)
mstored$(EXEEXT): $(mstored_SOURCES)
mstored$(EXEEXT): $(mstored_SOURCES) $(EXTRA_mstored_SOURCES)
env CGO_ENABLED=1 $(GO) build $(GOFLAGS) -o mstored$(EXEEXT) $(mstored_SOURCES)
run: $(mstored_SOURCES)
@@ -26,6 +26,139 @@ run: $(mstored_SOURCES)
CWD=$(shell pwd)
EXTRA_mstored_SOURCES = \
app/config/config.go \
app/config/variant.go \
app/descr/account.go \
app/descr/blob.go \
app/descr/file.go \
app/descr/grant.go \
app/descr/manifest.go \
app/descr/response.go \
app/descr/server.go \
app/handler/aaafunc.go \
app/handler/account.go \
app/handler/blob.go \
app/handler/file.go \
app/handler/grant.go \
app/handler/handler.go \
app/handler/manifest.go \
app/handler/notfound.go \
app/handler/response.go \
app/handler/service.go \
app/handler/version.go \
app/logger/logger.go \
app/maindb/account.go \
app/maindb/blob.go \
app/maindb/file.go \
app/maindb/grant.go \
app/maindb/init.go \
app/maindb/maindb.go \
app/maindb/manifest.go \
app/maindb/scheme.go \
app/operator/account.go \
app/operator/blob.go \
app/operator/file.go \
app/operator/grant.go \
app/operator/imgaux.go \
app/operator/manifest.go \
app/operator/ociaux.go \
app/operator/operator.go \
app/operator/service.go \
app/operator/version.go \
app/router/bindobj.go \
app/router/context.go \
app/router/corsmw.go \
app/router/loggingmw.go \
app/router/pathc.go \
app/router/recovermw.go \
app/router/router.go \
app/server/server.go \
app/service/service.go \
app/storage/storage.go \
pkg/auxhttp/basic.go \
pkg/auxhttp/crange.go \
pkg/auxoci/ociaux.go \
pkg/auxpwd/passwd.go \
pkg/auxtool/cleandir.go \
pkg/auxtool/fileex.go \
pkg/auxtool/randstr.go \
pkg/auxtool/tmpfile.go \
pkg/auxtool/unixnow.go \
pkg/auxutar/utar.go \
pkg/auxuuid/uuid.go \
pkg/auxx509/x509cert.go \
pkg/client/account.go \
pkg/client/client.go \
pkg/client/fileaux.go \
pkg/client/file.go \
pkg/client/grant.go \
pkg/client/httpcall.go \
pkg/client/imageaux.go \
pkg/client/imagedelete.go \
pkg/client/imageinfo.go \
pkg/client/imagepull.go \
pkg/client/imagepush.go \
pkg/client/service.go
EXTRA_DIST = \
Containerfile \
go.mod \
go.sum \
LICENSE.txt \
README.md \
app/logger/logger_test.go \
app/maindb/file_test.go \
app/maindb/grant_test.go \
app/router/pathc_test.go \
app/router/router_test.go \
pkg/auxpwd/passwd_test.go \
pkg/auxx509/x509cert_test.go \
attic/account_test.go \
attic/file_test.go \
chart/Chart.yaml.in \
chart/.gitignore \
chart/.helmignore \
chart/templates/configmap.yaml \
chart/templates/deployment.yaml \
chart/templates/_imagepath.tpl \
chart/templates/_serviceport.tmpl \
chart/templates/service.yaml \
chart/templates/_storageclass.tpl \
chart/templates/_storagesize.tpl \
chart/templates/_userpass.tpl \
chart/templates/volumeclaim.yaml \
chart/values.yaml.in \
debian/changelog.in \
debian/compat \
debian/control.in \
debian/debhelper-build-stamp \
debian/files \
debian/.gitignore \
debian/mstore-control.install \
debian/mstore-control.postinst \
debian/mstore-control.postrm \
debian/mstore-control.preinst \
debian/mstore-control.prerm \
debian/mstore-service.install \
debian/mstore-service.postinst \
debian/mstore-service.postrm \
debian/mstore-service.preinst \
debian/mstore-service.prerm \
debian/patches/series \
debian/README.Debian \
debian/rules \
debian/source/format \
debian/source/include-binaries \
debian/watch \
initrc/.gitignore \
initrc/mstored.in \
initrc/mstored.service.in \
test/account_test.go \
test/file_test.go \
test/image_test.go \
test/test-oci.img
format:
@dirs=$$($(FIND) $(CWD) -name '*.go' | $(XARGS) -n1 dirname | $(SORT) | $(UNIQ)); \
for dir in $$dirs;do \
@@ -38,12 +171,15 @@ test:
DIST_DIR= $(shell pwd)/DIST
BUILD_DIR= $(shell pwd)/BUILD
IMAGE_REPO = localhost
IMAGE_NAME = $(PACKAGE_NAME):$(PACKAGE_VERSION)
IMAGE_TARNAME = $(PACKAGE_NAME)-$(PACKAGE_VERSION).img
IMAGE_CONTAINERFILE = Containerfile
image:: build-image
build-image: clean
$(GO) mod vendor
@@ -63,6 +199,20 @@ build-chart:
mkdir -p $(DIST_DIR)
$(HELM) package --destination $(DIST_DIR) chart/
$(DIST_ARCHIVES): dist
package:: debian-package
debian-package: $(DIST_ARCHIVES)
mkdir -p $(BUILD_DIR)
mv $(DIST_ARCHIVES) $(BUILD_DIR)
cd $(BUILD_DIR) && $(AMTAR) -xf $(DIST_ARCHIVES)
cd $(BUILD_DIR)/$(distdir) && ./configure --prefix=/usr
cd $(BUILD_DIR)/$(distdir) && $(MAKE) clean
cd $(BUILD_DIR)/$(distdir) && $(DPKGSOURCE) -i --before-build .
cd $(BUILD_DIR)/$(distdir) && $(DBUILDPACKAGE) -nc -us -uc -ui -i -b
mkdir -p $(DIST_DIR)
$(CP) $(BUILD_DIR)/*.deb $(DIST_DIR)
rm -rf $(BUILD_DIR)
FREEBSD_LOCALBASE = /usr/local
FREEBSD_RCDIR = $(FREEBSD_LOCALBASE)/etc/rc.d
Makefile.in
+166 -5
View File
@@ -101,7 +101,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES = app/config/variant.go initrc/mstored.service \
initrc/mstored chart/Chart.yaml chart/values.yaml
initrc/mstored chart/Chart.yaml chart/values.yaml \
debian/control debian/changelog
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
@@ -138,8 +139,10 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = $(mstorectl_SOURCES) $(mstored_SOURCES)
DIST_SOURCES = $(mstorectl_SOURCES) $(mstored_SOURCES)
SOURCES = $(mstorectl_SOURCES) $(mstored_SOURCES) \
$(EXTRA_mstored_SOURCES)
DIST_SOURCES = $(mstorectl_SOURCES) $(mstored_SOURCES) \
$(EXTRA_mstored_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -167,6 +170,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in \
$(top_srcdir)/app/config/variant.go.in \
$(top_srcdir)/chart/Chart.yaml.in \
$(top_srcdir)/chart/values.yaml.in \
$(top_srcdir)/debian/changelog.in \
$(top_srcdir)/debian/control.in \
$(top_srcdir)/initrc/mstored.in \
$(top_srcdir)/initrc/mstored.service.in README.md config.guess \
config.sub install-sh missing
@@ -202,7 +207,9 @@ CPIO = @CPIO@
CSCOPE = @CSCOPE@
CTAGS = @CTAGS@
CYGPATH_W = @CYGPATH_W@
DBUILDPACKAGE = @DBUILDPACKAGE@
DEFS = @DEFS@
DPKGSOURCE = @DPKGSOURCE@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -229,6 +236,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PODMAN = @PODMAN@
ROOT_GROUP = @ROOT_GROUP@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -306,7 +314,141 @@ mstored_SOURCES = \
cmd/mstored/main.go
CWD = $(shell pwd)
EXTRA_mstored_SOURCES = \
app/config/config.go \
app/config/variant.go \
app/descr/account.go \
app/descr/blob.go \
app/descr/file.go \
app/descr/grant.go \
app/descr/manifest.go \
app/descr/response.go \
app/descr/server.go \
app/handler/aaafunc.go \
app/handler/account.go \
app/handler/blob.go \
app/handler/file.go \
app/handler/grant.go \
app/handler/handler.go \
app/handler/manifest.go \
app/handler/notfound.go \
app/handler/response.go \
app/handler/service.go \
app/handler/version.go \
app/logger/logger.go \
app/maindb/account.go \
app/maindb/blob.go \
app/maindb/file.go \
app/maindb/grant.go \
app/maindb/init.go \
app/maindb/maindb.go \
app/maindb/manifest.go \
app/maindb/scheme.go \
app/operator/account.go \
app/operator/blob.go \
app/operator/file.go \
app/operator/grant.go \
app/operator/imgaux.go \
app/operator/manifest.go \
app/operator/ociaux.go \
app/operator/operator.go \
app/operator/service.go \
app/operator/version.go \
app/router/bindobj.go \
app/router/context.go \
app/router/corsmw.go \
app/router/loggingmw.go \
app/router/pathc.go \
app/router/recovermw.go \
app/router/router.go \
app/server/server.go \
app/service/service.go \
app/storage/storage.go \
pkg/auxhttp/basic.go \
pkg/auxhttp/crange.go \
pkg/auxoci/ociaux.go \
pkg/auxpwd/passwd.go \
pkg/auxtool/cleandir.go \
pkg/auxtool/fileex.go \
pkg/auxtool/randstr.go \
pkg/auxtool/tmpfile.go \
pkg/auxtool/unixnow.go \
pkg/auxutar/utar.go \
pkg/auxuuid/uuid.go \
pkg/auxx509/x509cert.go \
pkg/client/account.go \
pkg/client/client.go \
pkg/client/fileaux.go \
pkg/client/file.go \
pkg/client/grant.go \
pkg/client/httpcall.go \
pkg/client/imageaux.go \
pkg/client/imagedelete.go \
pkg/client/imageinfo.go \
pkg/client/imagepull.go \
pkg/client/imagepush.go \
pkg/client/service.go
EXTRA_DIST = \
Containerfile \
go.mod \
go.sum \
LICENSE.txt \
README.md \
app/logger/logger_test.go \
app/maindb/file_test.go \
app/maindb/grant_test.go \
app/router/pathc_test.go \
app/router/router_test.go \
pkg/auxpwd/passwd_test.go \
pkg/auxx509/x509cert_test.go \
attic/account_test.go \
attic/file_test.go \
chart/Chart.yaml.in \
chart/.gitignore \
chart/.helmignore \
chart/templates/configmap.yaml \
chart/templates/deployment.yaml \
chart/templates/_imagepath.tpl \
chart/templates/_serviceport.tmpl \
chart/templates/service.yaml \
chart/templates/_storageclass.tpl \
chart/templates/_storagesize.tpl \
chart/templates/_userpass.tpl \
chart/templates/volumeclaim.yaml \
chart/values.yaml.in \
debian/changelog.in \
debian/compat \
debian/control.in \
debian/debhelper-build-stamp \
debian/files \
debian/.gitignore \
debian/mstore-control.install \
debian/mstore-control.postinst \
debian/mstore-control.postrm \
debian/mstore-control.preinst \
debian/mstore-control.prerm \
debian/mstore-service.install \
debian/mstore-service.postinst \
debian/mstore-service.postrm \
debian/mstore-service.preinst \
debian/mstore-service.prerm \
debian/patches/series \
debian/README.Debian \
debian/rules \
debian/source/format \
debian/source/include-binaries \
debian/watch \
initrc/.gitignore \
initrc/mstored.in \
initrc/mstored.service.in \
test/account_test.go \
test/file_test.go \
test/image_test.go \
test/test-oci.img
DIST_DIR = $(shell pwd)/DIST
BUILD_DIR = $(shell pwd)/BUILD
IMAGE_REPO = localhost
IMAGE_NAME = $(PACKAGE_NAME):$(PACKAGE_VERSION)
IMAGE_TARNAME = $(PACKAGE_NAME)-$(PACKAGE_VERSION).img
@@ -361,6 +503,10 @@ chart/Chart.yaml: $(top_builddir)/config.status $(top_srcdir)/chart/Chart.yaml.i
cd $(top_builddir) && $(SHELL) ./config.status $@
chart/values.yaml: $(top_builddir)/config.status $(top_srcdir)/chart/values.yaml.in
cd $(top_builddir) && $(SHELL) ./config.status $@
debian/control: $(top_builddir)/config.status $(top_srcdir)/debian/control.in
cd $(top_builddir) && $(SHELL) ./config.status $@
debian/changelog: $(top_builddir)/config.status $(top_srcdir)/debian/changelog.in
cd $(top_builddir) && $(SHELL) ./config.status $@
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -813,10 +959,10 @@ uninstall-am: uninstall-binPROGRAMS uninstall-sbinPROGRAMS
.PRECIOUS: Makefile
mstorectl$(EXEEXT): $(mstorectl_SOURCES)
mstorectl$(EXEEXT): $(mstorectl_SOURCES) $(EXTRA_mstored_SOURCES)
env CGO_ENABLED=0 $(GO) build $(GOFLAGS) -o mstorectl$(EXEEXT) $(mstorectl_SOURCES)
mstored$(EXEEXT): $(mstored_SOURCES)
mstored$(EXEEXT): $(mstored_SOURCES) $(EXTRA_mstored_SOURCES)
env CGO_ENABLED=1 $(GO) build $(GOFLAGS) -o mstored$(EXEEXT) $(mstored_SOURCES)
run: $(mstored_SOURCES)
@@ -849,6 +995,21 @@ build-chart:
mkdir -p $(DIST_DIR)
$(HELM) package --destination $(DIST_DIR) chart/
$(DIST_ARCHIVES): dist
package:: debian-package
debian-package: $(DIST_ARCHIVES)
mkdir -p $(BUILD_DIR)
mv $(DIST_ARCHIVES) $(BUILD_DIR)
cd $(BUILD_DIR) && $(AMTAR) -xf $(DIST_ARCHIVES)
cd $(BUILD_DIR)/$(distdir) && ./configure --prefix=/usr
cd $(BUILD_DIR)/$(distdir) && $(MAKE) clean
cd $(BUILD_DIR)/$(distdir) && $(DPKGSOURCE) -i --before-build .
cd $(BUILD_DIR)/$(distdir) && $(DBUILDPACKAGE) -nc -us -uc -ui -i -b
mkdir -p $(DIST_DIR)
$(CP) $(BUILD_DIR)/*.deb $(DIST_DIR)
rm -rf $(BUILD_DIR)
install-data-local:
test -z $(DESTDIR)$(srv_confdir) || $(MKDIR_P) $(DESTDIR)$(srv_confdir)
test -z $(DESTDIR)$(srv_logdir) || $(MKDIR_P) $(DESTDIR)$(srv_logdir)
app/config/variant.go
-10
View File
@@ -1,10 +0,0 @@
package config
const (
confdir = "/home/ziggi/Projects/mstore/etc/mstore"
rundir = "/home/ziggi/Projects/mstore/tmp/run"
logdir = "/home/ziggi/Projects/mstore/tmp/log"
datadir = "/home/ziggi/Projects/mstore/tmp/data"
version = "0.1.0"
srvname = "mstored"
)
configure
Vendored
+154 -1
View File
@@ -638,7 +638,10 @@ build_vendor
build_cpu
build
CP
DPKGSOURCE
DBUILDPACKAGE
HELM
PODMAN
BASENAME
CPIO
SUDO
@@ -3043,6 +3046,56 @@ fi
done
for ac_prog in podman true
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_path_PODMAN+y}
then :
printf %s "(cached) " >&6
else $as_nop
case $PODMAN in
[\\/]* | ?:[\\/]*)
ac_cv_path_PODMAN="$PODMAN" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
case $as_dir in #(((
'') as_dir=./ ;;
*/) ;;
*) as_dir=$as_dir/ ;;
esac
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_path_PODMAN="$as_dir$ac_word$ac_exec_ext"
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
PODMAN=$ac_cv_path_PODMAN
if test -n "$PODMAN"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PODMAN" >&5
printf "%s\n" "$PODMAN" >&6; }
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
fi
test -n "$PODMAN" && break
done
for ac_prog in helm true
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -3093,7 +3146,105 @@ fi
test -n "$HELM" && break
done
for ac_prog in dpkg-buildpackage true
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_path_DBUILDPACKAGE+y}
then :
printf %s "(cached) " >&6
else $as_nop
case $DBUILDPACKAGE in
[\\/]* | ?:[\\/]*)
ac_cv_path_DBUILDPACKAGE="$DBUILDPACKAGE" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
case $as_dir in #(((
'') as_dir=./ ;;
*/) ;;
*) as_dir=$as_dir/ ;;
esac
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_path_DBUILDPACKAGE="$as_dir$ac_word$ac_exec_ext"
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
DBUILDPACKAGE=$ac_cv_path_DBUILDPACKAGE
if test -n "$DBUILDPACKAGE"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DBUILDPACKAGE" >&5
printf "%s\n" "$DBUILDPACKAGE" >&6; }
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
fi
test -n "$DBUILDPACKAGE" && break
done
for ac_prog in dpkg-source true
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_path_DPKGSOURCE+y}
then :
printf %s "(cached) " >&6
else $as_nop
case $DPKGSOURCE in
[\\/]* | ?:[\\/]*)
ac_cv_path_DPKGSOURCE="$DPKGSOURCE" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
case $as_dir in #(((
'') as_dir=./ ;;
*/) ;;
*) as_dir=$as_dir/ ;;
esac
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_path_DPKGSOURCE="$as_dir$ac_word$ac_exec_ext"
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
DPKGSOURCE=$ac_cv_path_DPKGSOURCE
if test -n "$DPKGSOURCE"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DPKGSOURCE" >&5
printf "%s\n" "$DPKGSOURCE" >&6; }
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
fi
test -n "$DPKGSOURCE" && break
done
for ac_prog in gcp cp
@@ -3550,7 +3701,7 @@ printf "%s\n" "$as_me: srv_datadir set as ${SRV_DATADIR}" >&6;}
ac_config_files="$ac_config_files Makefile app/config/variant.go initrc/mstored.service initrc/mstored chart/Chart.yaml chart/values.yaml"
ac_config_files="$ac_config_files Makefile app/config/variant.go initrc/mstored.service initrc/mstored chart/Chart.yaml chart/values.yaml debian/control debian/changelog"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -4294,6 +4445,8 @@ do
"initrc/mstored") CONFIG_FILES="$CONFIG_FILES initrc/mstored" ;;
"chart/Chart.yaml") CONFIG_FILES="$CONFIG_FILES chart/Chart.yaml" ;;
"chart/values.yaml") CONFIG_FILES="$CONFIG_FILES chart/values.yaml" ;;
"debian/control") CONFIG_FILES="$CONFIG_FILES debian/control" ;;
"debian/changelog") CONFIG_FILES="$CONFIG_FILES debian/changelog" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
configure.ac
+5 -2
View File
@@ -18,9 +18,10 @@ AC_PATH_PROGS([SUDO],[sudo false])
AC_PATH_PROGS([CPIO],[cpio false])
AC_PATH_PROGS([BASENAME],[basename])
AC_PATH_PROGS([PODMAN],[podman true])
AC_PATH_PROGS([HELM],[helm true])
AC_PATH_PROGS([DBUILDPACKAGE],[dpkg-buildpackage true])
AC_PATH_PROGS([DPKGSOURCE],[dpkg-source true])
AC_PATH_PROGS([CP],[gcp cp])
if test -z "$CP"; then
@@ -246,5 +247,7 @@ initrc/mstored.service
initrc/mstored
chart/Chart.yaml
chart/values.yaml
debian/control
debian/changelog
])
AC_OUTPUT
debian/.gitignore
+2
View File
@@ -0,0 +1,2 @@
changelog
control
debian/README.Debian
Vendored
+1
View File
@@ -0,0 +1 @@
mstore for Debian
debian/changelog.in
Vendored
+5
View File
@@ -0,0 +1,5 @@
mstore (@PACKAGE_VERSION@-1) unstable; urgency=low
* Release.
-- Oleg Borodin <borodin@unix7.org> Sun, 29 Oct 2017 18:57:56 +0200
debian/compat
Vendored
+1
View File
@@ -0,0 +1 @@
10
debian/control.in
Vendored
+15
View File
@@ -0,0 +1,15 @@
Source: mstore
Section: utils
Priority: extra
Maintainer: borodin@unix7.org
Build-Depends: debhelper (>=8)
Standards-Version: @PACKAGE_VERSION@
Homepage: http://wiki.unix7.org
Package: mstore-control
Description: mstore
Architecture: amd64
Package: mstore-service
Description: mstore
Architecture: amd64
debian/debhelper-build-stamp
Vendored
+2
View File
@@ -0,0 +1,2 @@
mstore-control
mstore-service
debian/files
Vendored
+5
View File
@@ -0,0 +1,5 @@
mstore-control-dbgsym_2.11.0-1_amd64.deb debug optional automatic=yes
mstore-control_2.11.0-1_amd64.deb utils extra
mstore-service-dbgsym_2.11.0-1_amd64.deb debug optional automatic=yes
mstore-service_2.11.0-1_amd64.deb utils extra
mstore_2.11.0-1_amd64.buildinfo utils extra
debian/mstore-control.install
Vendored
+2
View File
@@ -0,0 +1,2 @@
usr/bin/mstorectl
debian/mstore-control.postinst
Vendored Executable
+2
View File
@@ -0,0 +1,2 @@
#!/bin/sh -e
debian/mstore-control.postrm
Vendored Executable
+2
View File
@@ -0,0 +1,2 @@
#!/bin/sh -e
debian/mstore-control.preinst
Vendored Executable
+20
View File
@@ -0,0 +1,20 @@
#!/bin/sh
set -e
case "$1" in
install|upgrade)
;;
abort-upgrade)
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
#DEBHELPER#
exit 0
debian/mstore-control.prerm
Vendored Executable
+2
View File
@@ -0,0 +1,2 @@
#!/bin/sh -e
debian/mstore-service.install
Vendored
+6
View File
@@ -0,0 +1,6 @@
usr/sbin/mstored
lib/systemd/system/mstored.service
var/run/mstore
var/log/mstore
etc/mstore
debian/mstore-service.postinst
Vendored Executable
+6
View File
@@ -0,0 +1,6 @@
#!/bin/sh -e
if [ "$1" = "configure" ] ; then
# Initial installation
systemctl preset mstored.service >/dev/null 2>&1 || :
fi
debian/mstore-service.postrm
Vendored Executable
+3
View File
@@ -0,0 +1,3 @@
#!/bin/sh -e
systemctl daemon-reload >/dev/null 2>&1 || :
debian/mstore-service.preinst
Vendored Executable
+20
View File
@@ -0,0 +1,20 @@
#!/bin/sh
set -e
case "$1" in
install|upgrade)
;;
abort-upgrade)
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
#DEBHELPER#
exit 0
debian/mstore-service.prerm
Vendored Executable
+7
View File
@@ -0,0 +1,7 @@
#!/bin/sh -e
if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
# Package removal, not upgrade
systemctl --no-reload disable mstored.service > /dev/null 2>&1 || :
systemctl stop mstored.service > /dev/null 2>&1 || :
fi
debian/patches/series
Vendored
+1
View File
@@ -0,0 +1 @@
# You must remove unused comment lines for the released package.
debian/rules
Vendored Executable
+11
View File
@@ -0,0 +1,11 @@
#!/usr/bin/make -f
export GO111MODULE=on
%:
dh $@
override_dh_auto_configure:
./configure --prefix=/usr
#EOF
debian/source/format
Vendored
+1
View File
@@ -0,0 +1 @@
3.0 (quilt)
debian/source/include-binaries
Vendored
View File
debian/watch
Vendored
+1
View File
@@ -0,0 +1 @@
version=3
initrc/mstored.service
-12
View File
@@ -1,12 +0,0 @@
[Unit]
Description=mstored
[Service]
Type=forking
PIDFile=/home/ziggi/Projects/mstore/tmp/run/mstored.pid
ExecStart=/usr/local/sbin/mstored -daemon=true
ExecReload=/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target
test/account_test.go
+1 -1
View File
@@ -34,7 +34,7 @@ func TestAccountLife(t *testing.T) {
{
err = srv.Configure()
require.NoError(t, err)
useTmp := false
useTmp := true
if useTmp {
srv.SetDatadir(srvdir)
srv.SetLogdir(srvdir)
test/file_test.go
+1 -1
View File
@@ -36,7 +36,7 @@ func xxxTestFileLife(t *testing.T) {
err = srv.Configure()
require.NoError(t, err)
useTmpDir := false
useTmpDir := true
if useTmpDir {
srv.SetDatadir(srvdir)
srv.SetLogdir(srvdir)
test/image_test.go
+3 -1
View File
@@ -33,7 +33,9 @@ func xxxTestImageLife(t *testing.T) {
{
err = srv.Configure()
require.NoError(t, err)
if false {
useTmp := true
if useTmp {
srv.SetDatadir(srvdir)
srv.SetLogdir(srvdir)
srv.SetRundir(srvdir)