diff --git a/plugins/gogs/index.py b/plugins/gogs/index.py index 3e221841b..74534d574 100755 --- a/plugins/gogs/index.py +++ b/plugins/gogs/index.py @@ -99,7 +99,7 @@ def getRunUser(): "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip() return user else: - return 'root' + return 'gogs' __SR = '''#!/bin/bash PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin diff --git a/plugins/gogs/init.d/gogs.tpl b/plugins/gogs/init.d/gogs.tpl index af21a4fff..4e70732e6 100644 --- a/plugins/gogs/init.d/gogs.tpl +++ b/plugins/gogs/init.d/gogs.tpl @@ -30,7 +30,7 @@ HOME={$HOME_DIR} NAME=gogs GOGS_HOME={$SERVER_PATH}/gogs GOGS_PATH=${GOGS_HOME}/$NAME -GOGS_USER=midoks +GOGS_USER={$RUN_USER} SERVICENAME="Gogs" LOCKFILE=/tmp/gogs.lock LOGPATH=${GOGS_HOME}/log @@ -65,7 +65,7 @@ start() { stop() { cd ${GOGS_HOME} echo "Shutting down ${SERVICENAME}: \c" - which "killproc" > /dev/null + which killproc > /dev/null if [ $? -eq 0 ];then killproc ${NAME} else diff --git a/plugins/gogs/install.sh b/plugins/gogs/install.sh index 74834f39b..5002e4f05 100755 --- a/plugins/gogs/install.sh +++ b/plugins/gogs/install.sh @@ -49,6 +49,14 @@ Install_gogs() mv $serverPath/source/gogs/gogs_${version}/gogs/ $serverPath/gogs echo $version > $serverPath/gogs/version.pl + if id -u gogs > /dev/null 2>&1; then + echo "csvn user exists" + else + useradd gogs + cp /etc/sudoers{,.`date +"%Y-%m-%d_%H-%M-%S"`} + echo "gogs ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers + fi + echo 'install success' > $install_tmp } diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh index 8dbf89fd7..56bb4d749 100755 --- a/plugins/php/versions/53/install.sh +++ b/plugins/php/versions/53/install.sh @@ -63,6 +63,7 @@ cd $sourcePath/php/php-5.3.29 && ./configure \ --enable-sysvmsg \ --enable-intl \ --enable-exif \ +--witd-gd \ --enable-ftp \ --enable-wddx \ --enable-soap \ diff --git a/plugins/php/versions/phplib.conf b/plugins/php/versions/phplib.conf index d7dc36086..4e3ce97ac 100755 --- a/plugins/php/versions/phplib.conf +++ b/plugins/php/versions/phplib.conf @@ -67,7 +67,9 @@ "55", "56", "70", - "71" + "71", + "72", + "73" ], "type": "缓存器", "msg": "强大的内容缓存器,支持集群", @@ -83,7 +85,8 @@ "56", "70", "71", - "72" + "72", + "73" ], "type": "缓存器", "msg": "更强大的内容缓存器,支持集群", @@ -204,7 +207,9 @@ "name": "yac", "versions": [ "70", - "71" + "71", + "72", + "73" ], "type": "缓存器", "msg": "高性能无锁共享内存Cache", diff --git a/scripts/lib.sh b/scripts/lib.sh index 1fb09f5ee..5d995c445 100755 --- a/scripts/lib.sh +++ b/scripts/lib.sh @@ -46,24 +46,18 @@ echo -e "Install_Libmemcached" >> ${libPath}/lib.pl Install_Libiconv() { - if [ -d '/usr/local/libiconv' ];then - return - fi - cd ${run_path} - if [ ! -f "libiconv-1.14.tar.gz" ];then - wget -O libiconv-1.14.tar.gz ${download_Url}/src/libiconv-1.14.tar.gz -T 5 + cd ${sourcePath} + if [ ! -f ${libPath}/libiconv ];then + wget -O libiconv-1.15.tar.gz https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz -T 5 + tar zxf libiconv-1.15.tar.gz + cd libiconv-1.15 + ./configure --prefix=${libPath}/libiconv --enable-static + make && make install + cd ${sourcePath} + rm -rf libiconv-1.15 + rm -f libiconv-1.15.tar.gz fi - mkdir /patch - wget -O /patch/libiconv-glibc-2.16.patch ${download_Url}/src/patch/libiconv-glibc-2.16.patch -T 5 - tar zxf libiconv-1.14.tar.gz - cd libiconv-1.14 - patch -p0 < /patch/libiconv-glibc-2.16.patch - ./configure --prefix=/usr/local/libiconv --enable-static - make && make install - cd ${run_path} - rm -rf libiconv-1.14 - rm -f libiconv-1.14.tar.gz - echo -e "Install_Libiconv" >> /www/server/lib.pl + echo -e "Install_Libiconv" >> ${libPath}/lib.pl } Install_Libmcrypt() @@ -202,24 +196,24 @@ Install_OpenSSL() Install_Lib() { -if [ -f "/www/server/nginx/sbin/nginx" ] || [ -f "/www/server/apache/bin/httpd" ] || [ -f "/www/server/mysql/bin/mysql" ]; then - return -fi -lockFile='/www/server/panel/data/bt_lib.lock' -if [ ! -f "${lockFile}" ];then - sed -i "s#SELINUX=enforcing#SELINUX=disabled#" /etc/selinux/config - rpm -e --nodeps mariadb-libs-* - - mv /etc/yum.repos.d/epel.repo /etc/yum.repos.d/epel.repo.backup - rm -f /var/run/yum.pid - for yumPack in make cmake gcc gcc-c++ gcc-g77 flex bison file libtool libtool-libs autoconf kernel-devel patch wget libjpeg libjpeg-devel libpng libpng-devel libpng10 libpng10-devel gd gd-devel libxml2 libxml2-devel zlib zlib-devel glib2 glib2-devel tar bzip2 bzip2-devel libevent libevent-devel ncurses ncurses-devel curl curl-devel libcurl libcurl-devel e2fsprogs e2fsprogs-devel krb5 krb5-devel libidn libidn-devel openssl openssl-devel vim-minimal gettext gettext-devel ncurses-devel gmp-devel pspell-devel libcap diffutils ca-certificates net-tools libc-client-devel psmisc libXpm-devel git-core c-ares-devel libicu-devel libxslt libxslt-devel zip unzip glibc.i686 libstdc++.so.6 cairo-devel bison-devel ncurses-devel libaio-devel perl perl-devel perl-Data-Dumper lsof pcre pcre-devel vixie-cron crontabs expat-devel readline-devel; - do yum -y install $yumPack;done - - mv /etc/yum.repos.d/epel.repo.backup /etc/yum.repos.d/epel.repo - groupadd www - useradd -s /sbin/nologin -M -g www www - echo 'true' > $lockFile -fi + if [ -f "/www/server/nginx/sbin/nginx" ] || [ -f "/www/server/apache/bin/httpd" ] || [ -f "/www/server/mysql/bin/mysql" ]; then + return + fi + lockFile='${libPath}/data/mw_lib.lock' + if [ ! -f "${lockFile}" ];then + sed -i "s#SELINUX=enforcing#SELINUX=disabled#" /etc/selinux/config + rpm -e --nodeps mariadb-libs-* + + mv /etc/yum.repos.d/epel.repo /etc/yum.repos.d/epel.repo.backup + rm -f /var/run/yum.pid + for yumPack in make cmake gcc gcc-c++ gcc-g77 flex bison file libtool libtool-libs autoconf kernel-devel patch wget libjpeg libjpeg-devel libpng libpng-devel libpng10 libpng10-devel gd gd-devel libxml2 libxml2-devel zlib zlib-devel glib2 glib2-devel tar bzip2 bzip2-devel libevent libevent-devel ncurses ncurses-devel curl curl-devel libcurl libcurl-devel e2fsprogs e2fsprogs-devel krb5 krb5-devel libidn libidn-devel openssl openssl-devel vim-minimal gettext gettext-devel ncurses-devel gmp-devel pspell-devel libcap diffutils ca-certificates net-tools libc-client-devel psmisc libXpm-devel git-core c-ares-devel libicu-devel libxslt libxslt-devel zip unzip glibc.i686 libstdc++.so.6 cairo-devel bison-devel ncurses-devel libaio-devel perl perl-devel perl-Data-Dumper lsof pcre pcre-devel vixie-cron crontabs expat-devel readline-devel; + do yum -y install $yumPack;done + + mv /etc/yum.repos.d/epel.repo.backup /etc/yum.repos.d/epel.repo + groupadd www + useradd -s /sbin/nologin -M -g www www + echo 'true' > $lockFile + fi } Install_Zlib @@ -230,4 +224,4 @@ Install_OpenSSL # Install_Mhash # Install_Libmcrypt # Install_Mcrypt -# Install_Libiconv \ No newline at end of file +Install_Libiconv \ No newline at end of file