Fixed SSH + Install process changes

3 files changed, 12 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c6347c79d3b9..198540818441 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gitea-git
 	pkgdesc = A painless self-hosted Git service.
-	pkgver = r5656.a04718a2
+	pkgver = r5658.4b2c8ca5
 	pkgrel = 1
 	url = https://gitea.io/
 	install = gitea.install
@@ -10,6 +10,7 @@ pkgbase = gitea-git
 	arch = armv7h
 	license = MIT
 	makedepends = go
+	makedepends = go-bindata
 	depends = git
 	optdepends = sqlite: SQLite support
 	optdepends = mariadb: MariaDB support
@@ -28,7 +29,7 @@ pkgbase = gitea-git
 	source = 0001-Adjust-config-for-Arch-Linux-package.patch
 	source = 0002-Adjust-service-file-for-Arch-Linux-package.patch
 	sha256sums = SKIP
-	sha256sums = b50a9ef21216a1cd2183238f7baa2d37f9bca11706625a8ffb345ed8f838e540
+	sha256sums = 5dd56905a3641d7094964a69030fda4d79565a87ccd6dcc4a714b423ccfce9af
 	sha256sums = 6cd1daa666659a68c98376f8bfae55402b5ffc39c1bf42b5ae0ee700249a3b73
 
 pkgname = gitea-git
diff --git a/0001-Adjust-config-for-Arch-Linux-package.patch b/0001-Adjust-config-for-Arch-Linux-package.patch
index df3bbb88e7d9..924ce2205ac1 100644
--- a/0001-Adjust-config-for-Arch-Linux-package.patch
+++ b/0001-Adjust-config-for-Arch-Linux-package.patch
@@ -1,5 +1,5 @@
 --- app.ini
-+++ app.ini	2017-10-02 23:16:35.000000000 +0300
++++ app.ini	2017-10-04 10:39:12.000000000 +0300
 @@ -1,12 +1,12 @@
  ; App name that shows on every page title
  APP_NAME = Gitea: Git with a cup of tea
@@ -37,7 +37,7 @@
  SSH_LISTEN_PORT = %(SSH_PORT)s
  ; Root path of SSH directory, default is '~/.ssh', but you have to use '/home/git/.ssh'.
 -SSH_ROOT_PATH =
-+SSH_ROOT_PATH = /var/lib/gitea/repos/.ssh
++SSH_ROOT_PATH = /var/lib/gitea/.ssh
  ; Directory to create temporary files when test public key using ssh-keygen,
  ; default is system temporary directory.
  SSH_KEY_TEST_PATH =
@@ -47,8 +47,8 @@
  ; $ openssl pkcs12 -in cert.pfx -out key.pem -nocerts -nodes
 -CERT_FILE = custom/https/cert.pem
 -KEY_FILE = custom/https/key.pem
-+CERT_FILE = /var/lib/gitea/custom/https/cert.pem
-+KEY_FILE = /var/lib/gitea/custom/https/key.pem
++CERT_FILE = /var/lib/gitea/cert/cert.pem
++KEY_FILE = /var/lib/gitea/cert/key.pem
  ; Upper level of template and static file path
  ; default is the path where Gitea is executed
 -STATIC_ROOT_PATH =
diff --git a/PKGBUILD b/PKGBUILD
index 03c358a60e16..d5225ec8f04e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,8 +9,8 @@ _pkgname="gitea"
 _gourl="code.gitea.io"
 
 pkgname=$_pkgname-git
-pkgver=r5656.a04718a2
 pkgrel=1
+pkgver=r5658.4b2c8ca5
 pkgdesc="A painless self-hosted Git service."
 url="https://gitea.io/"
 license=("MIT")
@@ -34,7 +34,7 @@ source=("git://github.com/go-gitea/gitea.git"
         "0001-Adjust-config-for-Arch-Linux-package.patch"
         "0002-Adjust-service-file-for-Arch-Linux-package.patch")
 sha256sums=("SKIP"
-            "b50a9ef21216a1cd2183238f7baa2d37f9bca11706625a8ffb345ed8f838e540"
+            "5dd56905a3641d7094964a69030fda4d79565a87ccd6dcc4a714b423ccfce9af"
             "6cd1daa666659a68c98376f8bfae55402b5ffc39c1bf42b5ae0ee700249a3b73")
 
 pkgver() {
@@ -60,26 +60,12 @@ package() {
   install -Dm0755 "${srcdir}/src/${_gourl}/${_pkgname}/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
 
   install -dm0700 "${pkgdir}/var/log/${_pkgname}/"
-  install -dm0755 "${pkgdir}/usr/share/${_pkgname}/"
-  install -dm0755 "${pkgdir}/etc/${_pkgname}/"
+  install -dm0700 "${pkgdir}/var/cache/${_pkgname}/"
 
   install -dm0700 "${pkgdir}/var/lib/${_pkgname}/"
-  install -dm0700 "${pkgdir}/var/lib/${_pkgname}/conf/"
-  install -dm0700 "${pkgdir}/var/lib/${_pkgname}/custom/"
-  install -dm0700 "${pkgdir}/var/lib/${_pkgname}/data/"
-  install -dm0700 "${pkgdir}/var/lib/${_pkgname}/data/attachments/"
-  install -dm0700 "${pkgdir}/var/lib/${_pkgname}/data/avatars/"
-  install -dm0700 "${pkgdir}/var/lib/${_pkgname}/data/lfs/"
-  install -dm0700 "${pkgdir}/var/lib/${_pkgname}/data/sessions/"
-  install -dm0700 "${pkgdir}/var/lib/${_pkgname}/indexers/"
-  install -dm0700 "${pkgdir}/var/lib/${_pkgname}/repos/"
-
-  cp -r "${srcdir}/src/${_gourl}/${_pkgname}/options/gitignore" "${pkgdir}/var/lib/${_pkgname}/conf"
-  cp -r "${srcdir}/src/${_gourl}/${_pkgname}/options/label" "${pkgdir}/var/lib/${_pkgname}/conf"
-  cp -r "${srcdir}/src/${_gourl}/${_pkgname}/options/license" "${pkgdir}/var/lib/${_pkgname}/conf"
-  cp -r "${srcdir}/src/${_gourl}/${_pkgname}/options/locale" "${pkgdir}/var/lib/${_pkgname}/conf"
-  cp -r "${srcdir}/src/${_gourl}/${_pkgname}/options/readme" "${pkgdir}/var/lib/${_pkgname}/conf"
+  cp -r "${srcdir}/src/${_gourl}/${_pkgname}/options" "${pkgdir}/var/lib/${_pkgname}/conf"
 
+  install -dm0755 "${pkgdir}/usr/share/${_pkgname}/"
   cp -r "${srcdir}/src/${_gourl}/${_pkgname}/conf" "${pkgdir}/usr/share/${_pkgname}"
   cp -r "${srcdir}/src/${_gourl}/${_pkgname}/public" "${pkgdir}/usr/share/${_pkgname}"
   cp -r "${srcdir}/src/${_gourl}/${_pkgname}/templates" "${pkgdir}/usr/share/${_pkgname}"