Rename run_httpd.sh and occurences

We no longer run httpd.

Author: lbarcziova

CONTRIBUTING.md

@@ -47,11 +47,11 @@ This repository contains [docker-compose.yml](./docker-compose.yml) for
 (can be also [used with podman](https://fedoramagazine.org/use-docker-compose-with-podman-to-orchestrate-containers-on-fedora)).
 Before you run it, we suggest that you open the file and read all the comments.
 You can also run only certain pieces of packit-service for local development
-(e.g. worker, database or service/httpd).
+(e.g. worker, database or http service).
 You also need to populate `secrets/packit/dev/` manually, for instructions
 see [deployment repo](https://github.com/packit/deployment/tree/main/secrets).
 
-When you are running service/httpd and making requests to it,
+When you are running http service and making requests to it,
 make sure that `server_name` configuration file in `packit-service.yaml` is set.
 
 ### tokman
@@ -84,7 +84,7 @@ For this reason `docker-compose` needs access to ports lower than 1024:
 ### binding on other hosts
 
 If you are not binding the service on `localhost`
-then you **need** to make requests to httpd using the hostname
+then you **need** to make requests to http service using the hostname
 (which can be done by creating a new entry in `/etc/hosts` on your laptop)
 and you have to provide a route to that host.
 

docker-compose.yml

@@ -130,7 +130,7 @@ services:
       args:
         SOURCE_BRANCH: main
     image: quay.io/packit/packit-service:dev
-    command: /usr/bin/run_httpd.sh
+    command: /usr/bin/run_server.sh
     depends_on:
       - redis
       - postgres
@@ -157,7 +157,7 @@ services:
       - ./secrets/packit/dev/fedora.keytab:/secrets/fedora.keytab:ro,z
       - ./secrets/packit/dev/fullchain.pem:/secrets/fullchain.pem:ro,z
       - ./secrets/packit/dev/privkey.pem:/secrets/privkey.pem:ro,z
-      - ./files/run_httpd.sh:/usr/bin/run_httpd.sh:ro,z
+      - ./files/run_server.sh:/usr/bin/run_server.sh:ro,z
     user: "1024"
 
   dashboard:
@@ -172,7 +172,7 @@ services:
     #        server_name: service.localhost
     #        dashboard_url: https://dashboard.localhost:8443
     image: quay.io/packit/dashboard:stg
-    command: /usr/bin/run_httpd.sh
+    command: /usr/bin/run_server.sh
     depends_on:
       - service
     ports:

docs/database/README.md

@@ -10,7 +10,7 @@ the project which handles migrations and schema versioning for SQLAlchemy.
 To generate a migration script for your recent change you can use docker or
 more easily, with rootless podman, you can use our make target.
 
-Both expect that the `alembic upgrade head` is run in [run_httpd.sh](../../files/run_httpd.sh)
+Both expect that the `alembic upgrade head` is run in [run_server.sh](../../files/run_server.sh)
 during (packit-)service pod/container start.
 
 When modifying the migration manually, do not forget to update the downgrade

files/docker/Dockerfile

@@ -1,4 +1,4 @@
-# Image for the web service (httpd), for celery worker see files/docker/Dockerfile.worker
+# Image for the web service, for celery worker see files/docker/Dockerfile.worker
 
 FROM quay.io/packit/base:fedora
 
@@ -34,4 +34,4 @@ COPY alembic/ ./alembic/
 
 EXPOSE 8443
 
-CMD ["/usr/bin/run_httpd.sh"]
+CMD ["/usr/bin/run_server.sh"]

files/recipe.yaml

@@ -9,4 +9,4 @@
     packit_service_path: /src
   tasks:
     - import_tasks: tasks/common.yaml
-    - import_tasks: tasks/httpd.yaml
+    - import_tasks: tasks/server.yaml

files/run_httpd.sh files/run_server.sh

@@ -1,8 +1,8 @@
 # Copyright Contributors to the Packit project.
 # SPDX-License-Identifier: MIT
 
-- name: Copy run_httpd.sh
+- name: Copy run_server.sh
   ansible.builtin.copy:
-    src: run_httpd.sh
-    dest: /usr/bin/run_httpd.sh
+    src: run_server.sh
+    dest: /usr/bin/run_server.sh
     mode: 0775

files/tasks/httpd.yaml files/tasks/server.yaml

@@ -95,7 +95,7 @@ def is_multi_threaded() -> bool:
     # fails to rollback you have to restart the workers so that they pick another session.
     singleton_session = Session()
     logger.debug("Going to use a single SQLAlchemy session.")
-else:  # service/httpd
+else:  # http service
     Session = scoped_session(Session)
     singleton_session = None