diff options
| author | thecalcaholic <6317548+theCalcaholic@users.noreply.github.com> | 2022-10-09 20:00:54 +0300 |
|---|---|---|
| committer | thecalcaholic <6317548+theCalcaholic@users.noreply.github.com> | 2022-10-09 20:11:21 +0300 |
| commit | 8e0f68d0bd71dfb0d43724408ab5bb95ad42bd26 (patch) | |
| tree | a9e37da805385ef55089fd51e7bf9357eb5e8687 | |
| parent | 2c15ae683bc21ec71d884d8f9bff7f0a9bda76bc (diff) | |
install.sh: Install nc-datadir.cfg before running the app
Signed-off-by: thecalcaholic <6317548+theCalcaholic@users.noreply.github.com>
| -rw-r--r-- | .github/workflows/build-docker.yml | 4 | ||||
| -rw-r--r-- | install.sh | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 16dfe73b..4026dd87 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -67,6 +67,10 @@ jobs: VERSION: "${{ inputs.git_ref || github.ref }}" ARCH: "${{ inputs.arch || 'x86' }}" steps: + - name: Checkout code + uses: actions/checkout@v3 + with: + ref: "${{ env.VERSION }}" - name: Get previous release id: get_previous_version shell: bash @@ -56,6 +56,7 @@ touch /.ncp-image mkdir -p /usr/local/etc/ncp-config.d/ cp etc/ncp-config.d/nc-nextcloud.cfg /usr/local/etc/ncp-config.d/ +cp etc/ncp-config.d/nc-datadir.cfg /usr/local/etc/ncp-config.d/ cp etc/library.sh /usr/local/etc/ cp etc/ncp.cfg /usr/local/etc/ @@ -63,7 +64,6 @@ cp -r etc/ncp-templates /usr/local/etc/ install_app lamp.sh install_app bin/ncp/CONFIG/nc-nextcloud.sh run_app_unsafe bin/ncp/CONFIG/nc-nextcloud.sh -rm /usr/local/etc/ncp-config.d/nc-nextcloud.cfg # armbian overlay is ro systemctl restart mysqld # TODO this shouldn't be necessary, but somehow it's needed in Debian 9.6. Fixme install_app ncp.sh run_app_unsafe bin/ncp/CONFIG/nc-init.sh @@ -71,6 +71,7 @@ echo 'Moving data directory to a more sensible location' mkdir -p /opt/ncdata set_app_param nc-datadir.sh DATADIR '/opt/ncdata' run_app_unsafe bin/ncp/CONFIG/nc-datadir.sh +rm /usr/local/etc/ncp-config.d/nc-{nextcloud,datadir}.cfg # armbian overlay is ro rm /.ncp-image # skip on Armbian / Vagrant / LXD ... |