diff --git a/debian/changelog b/debian/changelog index 4c38e94..2bd355b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -vn-repo (2.0.34) stable; urgency=low +vn-repo (2.0.37) stable; urgency=low * Initial Release. diff --git a/debian/control b/debian/control index c45335a..352b444 100644 --- a/debian/control +++ b/debian/control @@ -1,10 +1,10 @@ Source: vn-repo Priority: optional Maintainer: Juan Ferrer Toribio -Build-Depends: build-essential, debhelper +Build-Depends: devscripts Standards-Version: 3.9.3 Section: misc -Homepage: https://www.verdnatura.es +Homepage: https://verdnatura.es Vcs-Git: https://git.verdnatura.es/vn-repo Package: vn-repo diff --git a/debian/postinst b/debian/postinst index 8118346..cd20688 100755 --- a/debian/postinst +++ b/debian/postinst @@ -3,7 +3,7 @@ set -e # Adds the repository user -useradd --shell /bin/bash --home-dir /var/cache/reprepro --create-home vn-repo || echo "User already exists." +useradd --shell /bin/bash --home-dir /var/lib/vn-repo --uid 899 --create-home vn-repo || echo "User already exists." # Enables Apache configuration diff --git a/vn-branch b/vn-branch index 3b0f034..831dc29 100755 --- a/vn-branch +++ b/vn-branch @@ -8,7 +8,7 @@ fi projectName=$1 repoDir="/var/lib/git/$projectName" srcDir="/tmp/vn-repo/$projectName/src" -logDir="$HOME/logs" +logDir="/usr/share/vn-repo/web/logs" logFile="$logDir/$projectName.out" mkdir -p "$logDir" diff --git a/vn-debuild b/vn-debuild index b4ec5b7..dd0ddfc 100755 --- a/vn-debuild +++ b/vn-debuild @@ -7,7 +7,6 @@ else srcDir="$1" fi - buildDir="$srcDir/.." repreproDir="/var/cache/reprepro" codename="stable" @@ -15,7 +14,7 @@ codename="stable" owner=`stat -c '%G' "$repreproDir/pool"` if [ "$owner" != "$USER" ]; then - echo "You must start this script with '$owner' user" + (>&2 echo "You must start this script with '$owner' user") exit 1 fi diff --git a/vn-repo.conf b/vn-repo.conf index 6bfe465..776f4e3 100644 --- a/vn-repo.conf +++ b/vn-repo.conf @@ -1,4 +1,4 @@ -Alias /apt /var/cache/reprepro/ +#Alias /apt /var/cache/reprepro/ #Alias /vn-repo /usr/share/vn-repo/web/ @@ -6,6 +6,13 @@ Alias /apt /var/cache/reprepro/ Options +FollowSymLinks AllowOverride None Require all granted + + + + Options Indexes + Options +FollowSymLinks + AllowOverride None + Require all granted @@ -14,10 +21,3 @@ Alias /apt /var/cache/reprepro/ - - - Options Indexes - Options +FollowSymLinks - AllowOverride None - Require all granted - diff --git a/web/main.js b/web/main.js index a1e0d19..cf89274 100644 --- a/web/main.js +++ b/web/main.js @@ -1,4 +1,4 @@ -let logsPath = '/apt/logs'; +let logsPath = 'logs'; window.onload = () => { let select = $('select');