From: Penny Leach Date: Tue, 15 Apr 2008 02:52:07 +0000 (+1200) Subject: deleted mason and nigel-base X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=10437888091d6face61da5f4db6bde556334de01;p=vserverctl.git deleted mason and nigel-base --- diff --git a/profile/mason/data/.bash_once b/profile/mason/data/.bash_once deleted file mode 100644 index e5feffa..0000000 --- a/profile/mason/data/.bash_once +++ /dev/null @@ -1,8 +0,0 @@ -# ~/.bash_once: sourced from .bash_profile then deleted -# -# include .bash_once if it exists, then remove it -if [ -d ~/work/head/ ]; then - echo "running automatic cvs checkout" - cd /home/donj/work/head/ - cvs co -d HEAD clients/nzrb/tab -fi diff --git a/profile/mason/data/.bash_profile b/profile/mason/data/.bash_profile deleted file mode 100644 index f143c9f..0000000 --- a/profile/mason/data/.bash_profile +++ /dev/null @@ -1,49 +0,0 @@ -# ~/.bash_profile: executed by bash(1) for login shells. -# -# Catalyst Systems Administrator version - note that you -# shouldn't customise this, since it will get overwritten -# with a new version from your package. If you want local -# actions on this machine put them into ~/.bash_profile_local -# which is sourced at the end, if it is present. -# - -DEBVERSION="`cat /etc/debian_version`" -UTFVERSION="3.1" -versions() { - cat /etc/debian_version - echo ${UTFVERSION} -} - -if [ "`versions | sort | head -n 1`" = "${UTFVERSION}" ] ; then - LC_CTYPE=en_NZ.UTF-8 - export LC_CTYPE - - LC_ALL=en_NZ.UTF-8 - export LC_ALL -fi - -# set variable identifying the chroot you work in -if [ -f /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) -fi - -# include .bashrc if it exists -if [ -f ~/.bashrc ]; then - . ~/.bashrc -fi - -# set PATH so it includes user's private bin if it exists -if [ -d ~/bin ] ; then - PATH=~/bin:"${PATH}" -fi - -# include .bash_profile_local if it exists -if [ -f ~/.bash_profile_local ]; then - . ~/.bash_profile_local -fi - -# include .bash_once if it exists, then remove it -if [ -f ~/.bash_once ]; then - . ~/.bash_once - rm ~/.bash_once -fi diff --git a/profile/mason/data/.bashrc b/profile/mason/data/.bashrc deleted file mode 100644 index fba6a60..0000000 --- a/profile/mason/data/.bashrc +++ /dev/null @@ -1,86 +0,0 @@ -# ~/.bashrc: executed by bash(1) for non-login shells. -# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) -# for examples - -# If not running interactively, don't do anything -[ -z "$PS1" ] && return - -# don't put duplicate lines in the history. See bash(1) for more options -export HISTCONTROL=ignoreboth -export HISTSIZE=1000 - -# git environment stuff -export GIT_AUTHOR_NAME='Donovan Jones' -export GIT_COMMITTER_NAME='Donovan Jones' -export GIT_COMMITTER_EMAIL='donovan@catalyst.net.nz' -export GIT_AUTHOR_EMAIL='donovan@catalyst.net.nz' - -# cvs environment stuff -export CVSROOT=':ext:donj@cvs.catalyst.net.nz:/cvs' -export CVS_RSH='/usr/bin/ssh' -unset CVSREAD - - -# check the window size after each command and, if necessary, -# update the values of LINES and COLUMNS. -shopt -s checkwinsize - -# make less more friendly for non-text input files, see lesspipe(1) -[ -x /usr/bin/lesspipe ] && eval "$(lesspipe)" - -# set variable identifying the chroot you work in (used in the prompt below) -if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) -fi - -# set a fancy prompt (non-color, unless we know we "want" color) -#case "$TERM" in -#xterm-color) -# PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' -# ;; -#*) -# PS1='${debian_chroot:+($debian_chroot)}\u@\h($SHLVL):\w\$ ' -# ;; -#esac - -# Comment in the above and uncomment this below for a color prompt -PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h($SHLVL)\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' - -# If this is an xterm set the title to user@host:dir -case "$TERM" in -xterm*|rxvt*) - PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD/$HOME/~}\007"' - ;; -*) - ;; -esac - -# Alias definitions. -# You may want to put all your additions into a separate file like -# ~/.bash_aliases, instead of adding them here directly. -# See /usr/share/doc/bash-doc/examples in the bash-doc package. - -#if [ -f ~/.bash_aliases ]; then -# . ~/.bash_aliases -#fi - -# enable color support of ls and also add handy aliases -if [ "$TERM" != "dumb" ]; then - eval "`dircolors -b`" - alias ls='ls --color=auto' - #alias dir='ls --color=auto --format=vertical' - #alias vdir='ls --color=auto --format=long' -fi - -# some more ls aliases -#alias ll='ls -l' -#alias la='ls -A' -#alias l='ls -CF' - - -# enable programmable completion features (you don't need to enable -# this, if it's already enabled in /etc/bash.bashrc and /etc/profile -# sources /etc/bash.bashrc). -if [ -f /etc/bash_completion ]; then - . /etc/bash_completion -fi diff --git a/profile/mason/data/.vimrc b/profile/mason/data/.vimrc deleted file mode 100644 index e12c9af..0000000 --- a/profile/mason/data/.vimrc +++ /dev/null @@ -1,25 +0,0 @@ -:syntax on -:set nocompatible -:set backup -:set showcmd -" tab stuff -:set tabstop=4 -:set shiftwidth=4 -:set expandtab -:set autoindent -:set shiftround -:set smarttab -" search related -:set hlsearch -:set incsearch -" clever autoindenting -filetype plugin indent on -" my maps -:map ,1 :s/^/#/:nohl -:map ,2 :set pastei -:map ,3 :nohl -:map ,4 :%s/^ // -:map ,5 :set filetype=mason -" up and down in split screen -:map ,k k -:map ,j j diff --git a/profile/mason/data/known_hosts b/profile/mason/data/known_hosts deleted file mode 100644 index 6b2eb39..0000000 --- a/profile/mason/data/known_hosts +++ /dev/null @@ -1 +0,0 @@ -cvs.catalyst.net.nz,202.78.240.34 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEApmC1UM46m0BF6FaOio/jkJRMxTLkW/JomVfu4hgK2HV1KPfWaHSyL8Yc0cgKA9pGv0oD/3q9ofhME4U7S3iezVSkFuawBYyoDEZssaXlsIB37UMstSR50pEiZU0+rW4Cc+fcFxhMcwWvBnAFy4VjNCjIqYah2dhTZQadLvJEmeE= diff --git a/profile/mason/data/nzrb.ini b/profile/mason/data/nzrb.ini deleted file mode 100644 index e27644e..0000000 --- a/profile/mason/data/nzrb.ini +++ /dev/null @@ -1,152 +0,0 @@ -[DB] -DBName=tab -Host=pg74 -Port= -User=tab -Password= -DefaultLang=en - -[Monitoring] -dailyCheckDir=/data/tab/dailycheck - -[microsites] -basedir=/data/shared/webdav/microsites - -[DSHR] -mappath=/data/shared/dshr -logopath=/data/shared/webdav/content/dshr/logos -presspath=/data/shared/webdav/content/dshr/press - -[info] -newsimgdir=/data/shared/webdav/content/news - -[memcached] -lockhost=localhost -lockport=11211 - -[ApacheSession] -Store=Postgres -Smepahores=32 - -[Site] -Domain=dev.tab.co.nz -Debug=0 -Staging=1 -Production=0 -DR=0 -BaseDir=/var/www/tab - -[TabSite] -StaticRoot=http://static.dev.tab.co.nz -EbetRoot=https://ebetdev.tab.co.nz -StaticDir=/var/www/tab/static -StripHTML=f -GZip=f - -[Email] -SMTPHost=localhost -Webmaster=webmaster@nzracingboard.co.nz -Admin=admin@tab.wgtn.cat-it.co.nz -XMLLoader=donovan@catalyst.net.nz -XMLLoaderError=tab-system@catalyst.net.nz -XMLLoaderNotify=donovan@catalyst.net.nz -JEQISendEmail=1 -JEQIError=donovan@catalyst.net.nz -JEQINotify=donovan@catalyst.net.nz -TabSystem=tab-system@catalyst.net.nz -TabDev=tab-system@catalyst.net.nz -Client=donovan@catalyst.net.nz -Administration=donovan@catalyst.net.nz - -[Admin] -Domain=tab-admin.wgtn.cat-it.co.nz - -[Log] -BaseDir=/var/log/tab - -[LogLevel] -NZRB.Lock=INFO -Default=INFO -heartbeat=DEBUG -jeqioddsnotification=DEBUG -webController=DEBUG -notificationProcessor=DEBUG -xmlloader=DEBUG -xmlloader_ng=DEBUG -jeqinotificationlistener=DEBUG -controllerTest=DEBUG -collectZipFiles=DEBUG -processZipFiles=DEBUG -jeqi=DEBUG -tracker=DEBUG -sendEmailSpool=DEBUG -sendSMSSpool=DEBUG -mergeJockeyNonSkeletons=DEBUG -mergeJockeySkelNonSkel=DEBUG -mergeJockeySkeletons=DEBUG -mergeRunnerNonSkeletons=DEBUG -mergeRunnerSkelNonSkel=DEBUG -mergeRunnerSkeletons=DEBUG -clubroomimport=DEBUG - -[Lucene] -Server=localhost -Port=22222 - -[JEQI] -SystemId=Catalyst_Dev -Server=203.96.82.132 -Port=3004 -PrimaryServer=203.96.82.132 -PrimaryPort=3004 -SecondaryServer=203.96.82.132 -SecondaryPort=3006 -TestServer=203.96.82.132 -TestPort=3002 -AbelardServer=abelard -AbelardPort=3004 -JeqiAServer=172.16.10.102 -JeqiAPort=2000 -JeqiBServer=172.16.10.103 -JeqiBPort=2000 -AutoServerList=secondary,primary - -[JESI] -Server=210.54.245.180 -Port=2001 - -[FtpFiles] -Protocol=Local -Host=socrates.catalyst.net.nz -User=tabftp -Pass=redrumpony -LocalDir=/data/shared/webdav/xml -TmpDir=/data/xmlfeeds/tmp -PendingDir=/data/xmlfeeds/pending -ProcessedDir=/data/xmlfeeds/processed -FailedDir=/data/xmlfeeds/failed -ProcessedFile=/data/xmlfeeds/ProcessedXmlZipFiles - -[Clubroom] -EmailSpoolDir=/data/tab/emailspool -EmailCreateDir=/data/tab/emailspool/create -EmailSentDir=/data/tab/emailspool/sent -EmailFailedDir=/data/tab/emailspool/failed -SmsSpoolDir=/data/tab/smsspool -SmsCreateDir=/data/tab/smsspool/create -SmsSentDir=/data/tab/smsspool/sent -SmsFailedDir=/data/tab/smsspool/failed -TextTemplate=/etc/tab/text.tt -HtmlTemplate=/etc/tab/html.tt -SmsTemplate=/etc/tab/sms.tt -ReturnAddress=donovan@catalyst.net.nz - -[SMS] -telecomuser=martyns -telecompass=tabtest -telecomshortcode=3822 -telecomhost=210.54.54.161 -vodafoneuser=voda -vodafonepass=adov -vodafoneshortcode=98425 -vodafonehost=202.78.240.38:13013 diff --git a/profile/mason/data/site.conf b/profile/mason/data/site.conf deleted file mode 100644 index 2e75e1f..0000000 --- a/profile/mason/data/site.conf +++ /dev/null @@ -1,25 +0,0 @@ -NameVirtualHost * - - - ServerName __VSNAME__.abelard.wgtn.cat-it.co.nz - - DocumentRoot /home/__PROFILEOPTION_username__/site - - - Order Allow,Deny - Allow from all - - Options Indexes - - - - SetHandler perl-script - PerlHandler HTML::Mason::ApacheHandler - - PerlSetVar MasonCompRoot /home/__PROFILEOPTION_username__/site - PerlSetVar MasonDataDir /home/__PROFILEOPTION_username__/.site.mason - PerlSetVar MasonErrorMode fatal - - - - diff --git a/profile/mason/files b/profile/mason/files deleted file mode 100644 index e69de29..0000000 diff --git a/profile/mason/options b/profile/mason/options deleted file mode 100644 index 27d7766..0000000 --- a/profile/mason/options +++ /dev/null @@ -1 +0,0 @@ -username diff --git a/profile/mason/packages b/profile/mason/packages deleted file mode 100644 index 5f8a913..0000000 --- a/profile/mason/packages +++ /dev/null @@ -1,14 +0,0 @@ -apache-perl -debconf -libapache-dbi-perl -libapache-mod-gzip -libapache-request-perl -libapache-session-perl -libconfig-inifiles-perl -libgetopt-mixed-perl -libhtml-mason-perl -libhtml-mason-perl-doc -liblog-log4perl-perl -libmd5-perl -lsof -postgresql-client diff --git a/profile/mason/post-vserver b/profile/mason/post-vserver deleted file mode 100644 index 4941f78..0000000 --- a/profile/mason/post-vserver +++ /dev/null @@ -1,6 +0,0 @@ -mkdir -p /home/${PROFILEOPTION_username}/site -mkdir -p /home/${PROFILEOPTION_username}/.site.mason -chown -R ${PROFILEOPTION_username}:${PROFILEOPTION_username} /home/${PROFILEOPTION_username} -chown www-data:www-data /home/${PROFILEOPTION_username}/.site.mason - -/usr/sbin/apache-perlctl restart diff --git a/profile/mason/profile.conf b/profile/mason/profile.conf deleted file mode 100644 index fbf3811..0000000 --- a/profile/mason/profile.conf +++ /dev/null @@ -1 +0,0 @@ -parent = webserver diff --git a/profile/mason/templates b/profile/mason/templates deleted file mode 100644 index fccf9fb..0000000 --- a/profile/mason/templates +++ /dev/null @@ -1 +0,0 @@ -site.conf /etc/apache-perl/conf.d/ diff --git a/profile/nigel-base/data/.bash_aliases b/profile/nigel-base/data/.bash_aliases deleted file mode 120000 index 0146ce6..0000000 --- a/profile/nigel-base/data/.bash_aliases +++ /dev/null @@ -1 +0,0 @@ -/home/nigel/.bash_aliases \ No newline at end of file diff --git a/profile/nigel-base/data/.bash_profile b/profile/nigel-base/data/.bash_profile deleted file mode 120000 index 0d9cdfa..0000000 --- a/profile/nigel-base/data/.bash_profile +++ /dev/null @@ -1 +0,0 @@ -/home/nigel/.bash_profile \ No newline at end of file diff --git a/profile/nigel-base/data/.bashrc b/profile/nigel-base/data/.bashrc deleted file mode 120000 index c9e4b37..0000000 --- a/profile/nigel-base/data/.bashrc +++ /dev/null @@ -1 +0,0 @@ -/home/nigel/.bashrc \ No newline at end of file diff --git a/profile/nigel-base/data/.inputrc b/profile/nigel-base/data/.inputrc deleted file mode 120000 index 5607ae8..0000000 --- a/profile/nigel-base/data/.inputrc +++ /dev/null @@ -1 +0,0 @@ -/home/nigel/.inputrc \ No newline at end of file diff --git a/profile/nigel-base/data/.screenrc b/profile/nigel-base/data/.screenrc deleted file mode 120000 index f908b32..0000000 --- a/profile/nigel-base/data/.screenrc +++ /dev/null @@ -1 +0,0 @@ -/home/nigel/.screenrc \ No newline at end of file diff --git a/profile/nigel-base/data/.vimrc b/profile/nigel-base/data/.vimrc deleted file mode 120000 index e265abd..0000000 --- a/profile/nigel-base/data/.vimrc +++ /dev/null @@ -1 +0,0 @@ -/home/nigel/.vimrc \ No newline at end of file diff --git a/profile/nigel-base/files b/profile/nigel-base/files deleted file mode 100644 index 8af21b8..0000000 --- a/profile/nigel-base/files +++ /dev/null @@ -1,6 +0,0 @@ -.bashrc /home/nigel -.bash_profile /home/nigel -.bash_aliases /home/nigel -.vimrc /home/nigel -.screenrc /home/nigel -.inputrc /home/nigel diff --git a/profile/nigel-base/packages b/profile/nigel-base/packages deleted file mode 100644 index fe54121..0000000 --- a/profile/nigel-base/packages +++ /dev/null @@ -1,3 +0,0 @@ -screen -vim -catalyst-nigelmcnie diff --git a/profile/nigel-base/pre-vserver b/profile/nigel-base/pre-vserver deleted file mode 100644 index 60ef2ba..0000000 --- a/profile/nigel-base/pre-vserver +++ /dev/null @@ -1,3 +0,0 @@ -# These lines should be reasonably temporary, until support for resolving all vservers is available -echo '10.0.0.2 pg74' >> /etc/hosts -echo '10.0.0.3 pg81' >> /etc/hosts