Merge pull request #638 from pkgr/pkgr

Fix packages generated on packager.io

2 files changed, 6 insertions, 5 deletions

diff --git a/.pkgr.yml b/.pkgr.yml
index 296920bece..23a52c8ddc 100644
--- a/.pkgr.yml
+++ b/.pkgr.yml
@@ -2,10 +2,7 @@ targets:
   ubuntu-14.04:
   ubuntu-12.04:
   debian-7:
-  centos6:
-build_dependencies:
-  - mercurial
-  - bzr
+  centos-6:
 dependencies:
   - git
 before:
diff --git a/packager/debian/postinst b/packager/debian/postinst
index de357967a6..d1b37ac18d 100755
--- a/packager/debian/postinst
+++ b/packager/debian/postinst
@@ -27,12 +27,16 @@ case "$1" in
     chown ${APP_USER}.${APP_GROUP} $(dirname ${APP_CONFIG})
     [ -f ${APP_CONFIG} ] || ${CLI} run cp conf/app.ini ${APP_CONFIG}
     ${CLI} config:set USER=${APP_USER}
-    ${CLI} config:set GOGS_CUSTOM="/etc/${APP_NAME}"
     PORT=$(${CLI} config:get PORT || echo "6000")
     sed -i "s|HTTP_PORT = 3000|HTTP_PORT = ${PORT}|" ${APP_CONFIG}
     sed -i "s|RUN_USER = git|RUN_USER = ${APP_USER}|" ${APP_CONFIG}
     sed -i "s|RUN_MODE = dev|RUN_MODE = prod|" ${APP_CONFIG}
 
+    # setup symlink towards custom conf
+    mkdir -p /opt/${APP_NAME}/custom/conf
+    chown -R ${APP_USER}.${APP_GROUP} /opt/${APP_NAME}/custom
+    ln -f -s ${APP_CONFIG} /opt/${APP_NAME}/custom/conf/app.ini
+
     # scale
     ${CLI} scale web=1 || true
   ;;