summaryrefslogtreecommitdiff
path: root/source/n/httpd
diff options
context:
space:
mode:
Diffstat (limited to 'source/n/httpd')
-rw-r--r--source/n/httpd/doinst.sh5
-rwxr-xr-xsource/n/httpd/httpd.SlackBuild5
-rw-r--r--source/n/httpd/httpd.url4
3 files changed, 8 insertions, 6 deletions
diff --git a/source/n/httpd/doinst.sh b/source/n/httpd/doinst.sh
index e233c362..b45fd2aa 100644
--- a/source/n/httpd/doinst.sh
+++ b/source/n/httpd/doinst.sh
@@ -20,8 +20,7 @@ preserve_perms() {
cat ${NEW} > ${NEW}.incoming
mv ${NEW}.incoming ${NEW}
fi
- # Don't use config() -- we always want to install this, changed or unchanged.
- #config ${NEW}
+ config ${NEW}
}
if [ ! -e var/log/httpd ]; then
@@ -55,8 +54,6 @@ fi
# Keep same perms when installing rc.httpd.new:
preserve_perms etc/rc.d/rc.httpd.new
-# Always install the new rc.httpd:
-mv etc/rc.d/rc.httpd.new etc/rc.d/rc.httpd
# Handle config files. Unless this is a fresh installation, the
# admin will have to move the .new files into place to complete
diff --git a/source/n/httpd/httpd.SlackBuild b/source/n/httpd/httpd.SlackBuild
index cb7db3d7..3c15fd8f 100755
--- a/source/n/httpd/httpd.SlackBuild
+++ b/source/n/httpd/httpd.SlackBuild
@@ -191,6 +191,11 @@ cat $CWD/rc.httpd > $PKG/etc/rc.d/rc.httpd.new
mkdir -p $PKG/etc/logrotate.d
cat $CWD/logrotate.httpd > $PKG/etc/logrotate.d/httpd.new
+# Add symlink that letsencrypt wants:
+( cd $PKG/usr/sbin
+ ln -sf apachectl apache2ctl
+)
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
diff --git a/source/n/httpd/httpd.url b/source/n/httpd/httpd.url
index 152982ae..f9402a47 100644
--- a/source/n/httpd/httpd.url
+++ b/source/n/httpd/httpd.url
@@ -1,2 +1,2 @@
-http://www.apache.org/dist/httpd/httpd-2.4.34.tar.bz2
-http://www.apache.org/dist/httpd/httpd-2.4.34.tar.bz2.asc
+http://www.apache.org/dist/httpd/httpd-2.4.35.tar.bz2
+http://www.apache.org/dist/httpd/httpd-2.4.35.tar.bz2.asc