Merge branch 'remove-symlinks'

3 files changed, 11 insertions, 56 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 893a61c3e811..7f35bdec9cda 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: s7hoang <s7hoang at gmail dot com>
 # Contributors: Janne Heß <jannehess at gmail dot com>
 pkgname=anki-sync-server-git
-pkgver=r408.0753292
+pkgver=r425.ef41934
 pkgrel=1
 pkgdesc="A sync server for anki using a forked version from github.com/ankicommunity (orig:dsnopek)"
 arch=('any')
@@ -15,6 +15,7 @@ optdepends=()
 install=anki-sync-server.install
 source=('git+https://github.com/ankicommunity/anki-sync-server.git')
 md5sums=('SKIP')
+backup=(etc/nginx/nginx.conf etc/nginx/sites-available/{anki-sync-server-http,anki-sync-server-https} usr/lib/systemd/system/anki-sync-server.service)
 
 _repo_dir_="$(basename ${source} | cut -f 1 -d '.')"
 _anki_dir_="${_repo_dir_}/src"
@@ -73,9 +74,12 @@ package() {
 
   # manpage
   mkdir -p "${pkgdir}/usr/share/man/man1"
-  ln -s -T "${_install_dir_}/plugins/man/man1/anki-sync-server.1.gz" "${pkgdir}/usr/share/man/man1/anki-sync-server.1.gz"
+  cp "${srcdir}/${_anki_dir_}/plugins/man/man1/anki-sync-server.1.gz" \
+    "${pkgdir}/usr/share/man/man1/anki-sync-server.1.gz"
 
   # nginx
   mkdir -p "${pkgdir}/etc/nginx/sites-available"
   mkdir -p "${pkgdir}/etc/nginx/sites-enabled"
+  cp "${srcdir}/${_anki_dir_}/plugins/nginx/anki-sync-server-http" "${pkgdir}/etc/nginx/sites-available"
+  cp "${srcdir}/${_anki_dir_}/plugins/nginx/anki-sync-server-https" "${pkgdir}/etc/nginx/sites-available"
 }
diff --git a/anki-sync-server.install b/anki-sync-server.install
index c1e5fb94de5c..26db524835cb 100644
--- a/anki-sync-server.install
+++ b/anki-sync-server.install
@@ -32,9 +32,6 @@ post_remove(){
   getent passwd anki-sync-server &>/dev/null && userdel anki-sync-server || true
   getent group anki-sync-server &>/dev/null && groupdel anki-sync-server || true
 
-  # remove systemd service symlink
-  rm -f '/usr/lib/systemd/system/anki-sync-server.service'
-
   echo "==================================================================="
   echo "rm -rf /opt/anki-sync-server to remove the database and cache files"
   echo "==================================================================="
@@ -43,24 +40,6 @@ post_remove(){
 pre_upgrade(){
   echo "stopping anki-sync-server.service..."
   sudo systemctl stop anki-sync-server.service
-
-  cd "/opt/anki-sync-server"
-
-  local _auth_="auth.db"
-  local _coll_="collections"
-  local _sess_="session.db"
-
-  if [ -f "${_auth_}" ]; then
-    sudo mv -v "${_auth_}" "${_auth_}.BAK"
-  fi
-
-  if [ -d "${_coll_}" ]; then
-    sudo mv -v "${_coll_}" "${_coll_}.BAK"
-  fi
-
-  if [ -f "${_sess_}" ]; then
-    sudo mv -v "${_sess_}" "${_sess_}.BAK"
-  fi
 }
 
 post_upgrade(){
@@ -70,24 +49,6 @@ post_upgrade(){
 
   append_nginx_config
 
-  cd "/opt/anki-sync-server"
-
-  local _auth_="auth.db"
-  local _coll_="collections"
-  local _sess_="session.db"
-
-  if [ -f "${_auth_}.BAK" ]; then
-    sudo mv -v "${_auth_}.BAK" "${_auth_}"
-  fi
-
-  if [ -d "${_coll_}.BAK" ]; then
-    sudo mv -v "${_coll_}.BAK" "${_coll_}"
-  fi
-
-  if [ -f "${_sess_}.BAK" ]; then
-    sudo mv -v "${_sess_}.BAK" "${_sess_}"
-  fi
-
   sudo chown -R anki-sync-server /opt/anki-sync-server
   sudo chgrp -R anki-sync-server /opt/anki-sync-server
 
@@ -95,8 +56,6 @@ post_upgrade(){
   sudo systemctl daemon-reload
   echo "starting anki-sync-server.service..."
   sudo systemctl start anki-sync-server
-  echo "restarting nginx..."
-  sudo systemctl restart nginx
 }
 
 function append_nginx_config() {
@@ -107,18 +66,10 @@ function append_nginx_config() {
   local _sites_enabled_dir_="${_config_dir_}/sites-enabled"
   local _nginx_plugins_dir_="/opt/anki-sync-server/plugins/nginx"
 
-  ! [ -f "${_sites_available_dir_}/anki-sync-server-http" ] && \
-    sudo \
-      ln -s "${_nginx_plugins_dir_}/anki-sync-server-http" \
-      "${_sites_available_dir_}/anki-sync-server-http"
-
-  ! [ -f "${_sites_available_dir_}/anki-sync-server-https" ] && \
-    sudo \
-      ln -s "${_nginx_plugins_dir_}/anki-sync-server-https" \
-      "${_sites_available_dir_}/anki-sync-server-https"
-
   if (grep "include[[:space:]]\+/etc/nginx/sites-enabled" "${_config_}" --quiet); then
     echo "nginx config aleady uses sites-enabled"
+    echo "not modifying nginx.conf!"
+    echo "= you may need to manually enable the anki server ="
   else
     sudo cp "${_config_}" "${_pacsave_}"
     sudo awk -f "${_nginx_plugins_dir_}/append.awk" \
diff --git a/anki-sync-server.service b/anki-sync-server.service
index 626eb30409b8..aff17e35ddf6 100644
--- a/anki-sync-server.service
+++ b/anki-sync-server.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=A personal sync server for anki
-StartLimitIntervalSec=30
-StartLimitBurst=6
+StartLimitIntervalSec=60
+StartLimitBurst=1
 Upholds=nginx.service
 PropagatesStopTo=nginx.service
 PropagatesReloadTo=nginx.service
@@ -13,7 +13,7 @@ Group=changeme
 WorkingDirectory=changeme
 ExecStart=python -m ankisyncd
 Restart=on-failure
-RestartSec=5
+RestartSec=60
 
 [Install]
 WantedBy=multi-user.target