System configuration update

4 files changed, 45 insertions, 52 deletions

diff --git a/tools/conf/srv/gitolite/.gitolite.rc b/tools/conf/srv/gitolite/.gitolite.rc
index fa18e4e..d2c80b7 100644
--- a/tools/conf/srv/gitolite/.gitolite.rc
+++ b/tools/conf/srv/gitolite/.gitolite.rc
@@ -28,7 +28,7 @@
     # logging options
     # 1. leave this section as is for 'normal' gitolite logging (default)
     # 2. uncomment this line to log ONLY to syslog:
-    # LOG_DEST                      => 'syslog',
+    LOG_DEST                      => 'syslog',
     # 3. uncomment this line to log to syslog and the normal gitolite log:
     # LOG_DEST                      => 'syslog,normal',
     # 4. prefixing "repo-log," to any of the above will **also** log just the
diff --git a/tools/conf/srv/gitolite/deploy-web-doc b/tools/conf/srv/gitolite/deploy-web-doc
index ae8e2db..b836515 100755
--- a/tools/conf/srv/gitolite/deploy-web-doc
+++ b/tools/conf/srv/gitolite/deploy-web-doc
@@ -2,7 +2,7 @@
 ######################################################################
 #
 # Put this file in your gitolite-admin;
-# ~/gitolite-admin/local/hooks/repo-specific/deploy-web-doc
+# ~/gitolite-admin/local/hooks/repo-specific/hook-deploy-web
 #
 # set host to empty to create package for each push
 # or set remote host to create package based on last deployed push
diff --git a/tools/conf/srv/gitolite/deploy-web.sh b/tools/conf/srv/gitolite/deploy-web.sh
index 01e92ac..86d2026 100644
--- a/tools/conf/srv/gitolite/deploy-web.sh
+++ b/tools/conf/srv/gitolite/deploy-web.sh
@@ -3,7 +3,7 @@
 pkg_path=$1
 
 www_root="/srv/www"
-www_user="nginx"
+www_user="www"
 www_group="www"
 
 pkg_file="${pkg_path}/project"
diff --git a/tools/conf/srv/gitolite/gitolite.conf b/tools/conf/srv/gitolite/gitolite.conf
index 3de7ba5..2685d90 100644
--- a/tools/conf/srv/gitolite/gitolite.conf
+++ b/tools/conf/srv/gitolite/gitolite.conf
@@ -1,80 +1,73 @@
-@guests         =   gitweb
-@interns        =   silvino
-@dev            =   silvino
-@teamleads      =   silvino
-@staff          =   @interns @dev @teamleads
+@guests         =   bob
+@interns        =   bob
+@dev            =   bob alice
+@teamleads      =   druid bob
+@staff          =   @interns @dev
+
 
 repo  @secret
     - = @guests
     option deny-rules = 1
 
 repo @floss
-    RW+                     =   @dev @staff
+    RW+                     =   @staff
     R                       =   @all
 
 repo @project
     RW+                     =   @teamleads
-    -   master              =   @dev
-    -   refs/tags/v[0-9]    =   @dev
-    RW+ develop/            =   @dev
-    RW+ feature/            =   @dev
-    RW+ hot-fix/            =   @dev
-    RW                      =   @dev
-    R                       =   @interns
+    -   master              =   @staff @guests
+    -   refs/tags/          =   @staff @guests
+    RW+ develop/            =   @staff
+    RW+ feature/            =   @staff
+    RW+ hot-fix/            =   @staff
+    RW                      =   @staff
+    R                       =   @all
 
 repo @mirror
+    R                       =   @all
     RW+ release/            =   @teamleads
     RW+ develop/            =   @dev
     RW+ feature/            =   @dev
     RW+ hot-fix/            =   @dev
-    R                       =   @all
+    option upstream.nice    = 120
 
 repo gitolite-admin
     RW+     =   gitolite
 
-repo doc machine-ports pmwiki assistant
-    config gitweb.owner         =   "Tribu Team"
-    config gitweb.category      =   "machine"
-
-repo linux-pck
-    config gitweb.owner         =   "Tribu Team"
-    config gitweb.category      =   "mirrors"
+repo mate
+    config gitweb.description   = "Mate ports"
 
-repo opt core contrib
-    config gitweb.owner         =   "crux"
-    config gitweb.category      =   "crux"
+repo kde5
+    config gitweb.description   = "Kde5 ports"
 
-repo doc
-    config gitweb.description   =   "documentation"
-    option hook.post-receive     =  deploy-web-doc
-
-repo machine-ports
-    config gitweb.description   =   "ports"
+repo xorg
+    config gitweb.description   = "Xorg ports"
 
-repo pmwiki
-    config gitweb.description   =   "wiki"
-    option hook.post-receive     =  deploy-web-doc
+repo contrib
+    config gitweb.description   = "Contrib ports"
 
-repo assistant
-    config gitweb.owner         =   "Tribu Team"
-    config gitweb.description   =   "open assistant"
+repo opt
+    config gitweb.description   = "Opt ports"
 
 repo core
-    config gitweb.description   =   "crux core collection"
+    config gitweb.description   = "Core ports"
 
-repo opt
-    config gitweb.description   =   "crux opt collection"
+repo doc
+    config gitweb.description   = "System doc."
+    option hook.post-receive    = deploy-web-doc
 
-repo contrib
-    config gitweb.description   =   "crux contrib collection"
+repo ports
+    config gitweb.description   = "Extra ports."
+    option hook.post-receive    = deploy-web-doc
 
-repo linux-pck
-    config gitweb.description   =   "PCK or Parabola Community Kernel are multiple patches, pf-kernel and zen-kernel for Linux-libre kernel"
-    option      upstream.url    = git://git.parabola.nu/pck.git
-    option      upstream.nice   = 120
+repo doc
+    config gitweb.owner         =   "Team"
+    config gitweb.category      =   "Repositories"
 
+repo core opt contrib ports xorg iso mate kde5
+    config gitweb.owner         =   "Team"
+    config gitweb.category      =   "Host Ports"
 
-@secret    =   gitolite-admin
-@project   =   doc machine-ports pmwiki assistant
-@project   =   core opt contrib
-@mirror    =   linux-pck
+@secret    = gitolite-admin
+@project   = doc
+@project   = core opt contrib ports xorg iso mate kde5 webdata