Merge branch 'master' into sudoman-mods

diff --git a/class/50-host-classes b/class/50-host-classes
index 4fdb6bcecce184a849cbb45269799c8c95ae7c93..9d5257b22b4a3c60e044354a40475afb510ddb8f 100755 (executable)
--- a/class/50-host-classes
+++ b/class/50-host-classes
@@ -72,11 +72,14 @@ case $HOSTNAME in
        echo "FAIBASE WWW CIVICRM SYSADMIN VM MYSQLD"
        ;;
     gnusocial*)
-       echo "FAIBASE WWW SYSADMIN VM MYSQLD"
+       echo "FAIBASE WWW SYSADMIN VM MYSQLD GNUSOCIAL YOURLS"
        ;;
     nagios*)
        echo "FAIBASE SYSADMIN VM MYSQLD NAGIOS WWW"
        ;;
+    shopserver*)
+       echo "FAIBASE SYSADMIN KOSA MARIADB WWW"
+       ;;
     kdev*)
        echo "FAIBASE SYSADMIN KOSA VM MYSQLD PLONE WWW"
        ;;

diff --git a/package_config/CIVICRM b/package_config/CIVICRM
index 47ab13e615ae19ae71de4b22d19f00e2ecd0e03b..a3b6a613852fe2e948429491ea8f72ac23b6d817 100644 (file)
--- a/package_config/CIVICRM
+++ b/package_config/CIVICRM
@@ -2,3 +2,4 @@ PACKAGES aptitude CIVICRM
 php5
 libapache2-mod-php5
 wkhtmltopdf
+php-cas
\ No newline at end of file

diff --git a/package_config/GNUSOCIAL b/package_config/GNUSOCIAL
new file mode 100644 (file)
index 0000000..fa007e0
--- /dev/null
+++ b/package_config/GNUSOCIAL
@@ -0,0 +1,21 @@
+PACKAGES aptitude GNUSOCIAL
+apache2
+mysql-server
+php5
+php5-mysql
+libapache2-mod-php5
+php-apc
+php5-intl
+vsftpd
+php5-cli
+php5-gd
+wget
+unzip
+curl
+mysql-server
+php5-cgi
+php5-curl
+php5-gd
+git
+ca-certificates
+openssl

diff --git a/package_config/KOSA b/package_config/KOSA
index ca4bfa260dbdf51fde1d5295686255a0d6d194e3..5efcd37efc80517e45d04f66370c5ce83f3af516 100644 (file)
--- a/package_config/KOSA
+++ b/package_config/KOSA
@@ -1 +1,13 @@
 PACKAGES aptitude KOSA
+screen
+mlocate
+ncdu
+unzip
+openssl
+htop
+emacs24-nox
+wget
+apache2 
+php-cas 
+php5-mysql 
+php5-gd 
\ No newline at end of file

diff --git a/package_config/MARIADB b/package_config/MARIADB
new file mode 100644 (file)
index 0000000..ac60009
--- /dev/null
+++ b/package_config/MARIADB
@@ -0,0 +1,2 @@
+PACKAGES aptitude MARIADB
+mariadb-server
\ No newline at end of file

diff --git a/package_config/WORKSTATION b/package_config/WORKSTATION
index df8286a41b44cb913581f4117b85efb333b0d9fd..f8a207bbd22f6fa2a50538c2d74bf1cb05577150 100644 (file)
--- a/package_config/WORKSTATION
+++ b/package_config/WORKSTATION
@@ -25,3 +25,4 @@ vim
 screen
 tmux
 mosh
+file-roller

diff --git a/scripts/GNUSOCIAL/10_download_gnusocial.sh b/scripts/GNUSOCIAL/10_download_gnusocial.sh
new file mode 100644 (file)
index 0000000..48a7bc7
--- /dev/null
+++ b/scripts/GNUSOCIAL/10_download_gnusocial.sh
@@ -0,0 +1,17 @@
+#! /bin/bash
+
+# Download gnusocial directly from their download source, as it is the recommended route and there is no repo
+if ! $ROOTCMD getent passwd gnusocial ; then
+    $ROOTCMD adduser --system --ingroup www-data --disabled-password --gecos "gnusocial user" gnusocial
+fi
+
+if ! $ROOTCMD test -e /home/gnusocial/.ssh/id_rsa; then
+    $ROOTCMD echo | $ROOTCMD sudo -u gnusocial ssh-keygen -N ''
+fi
+
+if ! $ROOTCMD echo | cd /home/gnusocial/ 
+    mkdir /var/www/statusnet/
+    git clone https://git.gnu.io/gnu/gnu-social.git /home/gnusocial/gnu-social; then
+    rm -rf /home/gnusocial/gnu-social/.git
+    mv /home/gnusocial/gnu-social/* /var/www/statusnet/
+fi

diff --git a/scripts/YOURLS/10_download_yourls.sh b/scripts/YOURLS/10_download_yourls.sh
new file mode 100644 (file)
index 0000000..eae43f8
--- /dev/null
+++ b/scripts/YOURLS/10_download_yourls.sh
@@ -0,0 +1,19 @@
+#! /bin/bash
+
+YOURLS_VERS='1.7.1'
+
+# Download yourls and install; we're going to be doing this under the gnusocial user.
+if ! $ROOTCMD getent passwd gnusocial ; then
+    $ROOTCMD adduser --system --ingroup www-data --disabled-password --gecos "gnusocial user" gnusocial
+fi
+
+if ! $ROOTCMD test -e /home/gnusocial/.ssh/id_rsa; then
+    $ROOTCMD echo | $ROOTCMD sudo -u gnusocial ssh-keygen -N ''
+fi
+
+if ! $ROOTCMD echo | cd /home/gnusocial/ 
+    mkdir /var/www/yourls
+    curl https://codeload.github.com/YOURLS/YOURLS/tar.gz/$YOURLS_VERS -o /home/gnusocial/yourls.tar.gz; then
+    tar xf /home/gnusocial/yourls.tar.gz -C /home/gnusocial/
+    mv /home/gnusocial/YOURLS-$YOURLS_VERS/* /var/www/yourls/
+fi