From f8f54ad1926d3f10e895fda553474db278c2ed7d Mon Sep 17 00:00:00 2001
From: Parabola <dev@list.parabolagnulinux.org>
Date: Wed, 31 Oct 2012 04:44:23 +0000
Subject: sitting on the server

---
 README      |  3 +++
 config      |  2 +-
 config.orig | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 README
 create mode 100644 config.orig

diff --git a/README b/README
new file mode 100644
index 0000000..9ce2d3f
--- /dev/null
+++ b/README
@@ -0,0 +1,3 @@
+* Script to run if there is error and for update
+
+ - db-sync
diff --git a/config b/config
index 20ad307..7601527 100644
--- a/config
+++ b/config
@@ -10,7 +10,7 @@ OURREPOS=('libre' 'libre-testing')
 # User repos
 USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde')
 # Community project repos
-PROJREPOS=('pcr' 'social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross')
+PROJREPOS=('pcr' 'social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross' 'java' 'java-ugly')
 # Remote repos
 RMTREPOS=('connos' 'connos-extra')
 PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]})
diff --git a/config.orig b/config.orig
new file mode 100644
index 0000000..a32f82f
--- /dev/null
+++ b/config.orig
@@ -0,0 +1,54 @@
+#!/bin/bash
+<<<<<<< HEAD
+FTP_BASE="/srv/http/repo/public"
+ARCH_BASE="/srv/http/repo/public"
+SVNREPO="/srv/http/repo/abslibre"
+=======
+FTP_BASE="/srv/http/repo/public/temprepo"
+ARCH_BASE="/srv/http/repo/public/temprepo"
+SVNREPO="/var/abs"
+>>>>>>> 801ea2c927ace5ee892209dd8e3c1044e1b3842e
+
+# Repos from Arch
+ARCHREPOS=('core' 'testing') #'extra' 'community'  'testing' 'multilib')
+# Official Parabola repos
+OURREPOS=('libre' 'libre-testing')
+# User repos
+USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan')
+# Community project repos
+PROJREPOS=('social' 'elementary' 'kernels' 'radio' 'security' 'sugar')
+PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]})
+PKGPOOL='pool/packages'
+SRCPOOL='sources/packages'
+
+CLEANUP_DESTDIR="$FTP_BASE/old/packages"
+CLEANUP_DRYRUN=true
+# Time in days to keep moved packages
+CLEANUP_KEEP=30
+
+SOURCE_CLEANUP_DESTDIR="$FTP_BASE/old/sources"
+SOURCE_CLEANUP_DRYRUN=true
+# Time in days to keep moved sourcepackages
+SOURCE_CLEANUP_KEEP=30
+
+REQUIRE_SIGNATURE=true
+
+LOCK_DELAY=10
+LOCK_TIMEOUT=300
+
+STAGING="$FTP_BASE/staging"
+TMPDIR="/tmp"
+ARCHARCHES=(i686 x86_64)
+OURARCHES=(mips64el)
+ARCHES=(${ARCHARCHES[@]} ${OURARCHES[@]})
+DBEXT=".db.tar.gz"
+FILESEXT=".files.tar.gz"
+PKGEXT=".pkg.tar.?z"
+SRCEXT=".src.tar.gz"
+
+<<<<<<< HEAD
+MAKEPKGCONF="~/.makepkg.conf"
+=======
+MAKEPKGCONF="/etc/makepkg.conf"
+>>>>>>> 801ea2c927ace5ee892209dd8e3c1044e1b3842e
+BLACKLIST_FILE="$HOME/blacklist/blacklist.txt"
-- 
cgit v1.2.3