diff --git a/ansible/roles/pagure-dev/files/bashrc b/ansible/roles/pagure-dev/files/bashrc index c27610f..b1bdb22 100644 --- a/ansible/roles/pagure-dev/files/bashrc +++ b/ansible/roles/pagure-dev/files/bashrc @@ -15,13 +15,21 @@ fi export PAGURE_CONFIG=~/pagure.cfg pstart (){ - systemctl --user start pagure.service + systemctl --user start pagure.service pagure-docs.service pagure_ci.service\ + pagure_ev.service pagure_webhook.service } pstop (){ - systemctl --user stop pagure.service + systemctl --user stop pagure.service pagure-docs.service pagure_ci.service\ + pagure_ev.service pagure_webhook.service } prestart (){ - systemctl --user restart pagure.service + systemctl --user restart pagure.service pagure-docs.service pagure_ci.service\ + pagure_ev.service pagure_webhook.service +} + +pstatus (){ + systemctl --user restart pagure.service pagure-docs.service pagure_ci.service\ + pagure_ev.service pagure_webhook.service } diff --git a/ansible/roles/pagure-dev/files/pagure-docs.service b/ansible/roles/pagure-dev/files/pagure-docs.service index 2bbed4e..beeeca3 100644 --- a/ansible/roles/pagure-dev/files/pagure-docs.service +++ b/ansible/roles/pagure-dev/files/pagure-docs.service @@ -3,7 +3,9 @@ Description=Runs the Pagure documentation server After=network.target [Service] -ExecStart=/home/vagrant/.virtualenvs/python2-pagure/bin/python %h/devel/rundocserver.py -c %h/pagure.cfg --host 0.0.0.0 +Environment="PAGURE_CONFIG=/home/vagrant/pagure.cfg" +ExecStart=/home/vagrant/.virtualenvs/python2-pagure/bin/python \ + /home/vagrant/devel/rundocserver.py --host 0.0.0.0 Type=simple [Install] diff --git a/ansible/roles/pagure-dev/files/pagure.cfg b/ansible/roles/pagure-dev/files/pagure.cfg index 04aa335..f96f0de 100644 --- a/ansible/roles/pagure-dev/files/pagure.cfg +++ b/ansible/roles/pagure-dev/files/pagure.cfg @@ -23,11 +23,11 @@ ADMIN_GROUP = ['sysadmin-main'] PAGURE_ADMIN_USERS = [] ### The URL at which the project is available. -APP_URL = 'localhost' +APP_URL = '*' ### The URL at which the documentation of projects will be available ## This should be in a different domain to avoid XSS issues since we want ## to allow raw html to be displayed (different domain, ie not a sub-domain). -DOC_APP_URL = 'localhost' +DOC_APP_URL = '*' # Avoid sending emails while developing by default EMAIL_SEND = False @@ -120,7 +120,7 @@ IP_ALLOWED_INTERNAL = ['127.0.0.1', 'localhost', '::1',] # here what the URL of the eventsource server is, for example: # https://ev.pagure.io or https://pagure.io:8080 or whatever you are using # (Note: the urls sent to it start with a '/' so no need to add one yourself) -EVENTSOURCE_SOURCE = 'http://localhost' +EVENTSOURCE_SOURCE = 'http://localhost:8080' # Port where the event source server is running (maybe be the same port # as the one specified in EVENTSOURCE_SOURCE or a different one if you # have something running in front of the server such as apache or stunnel). @@ -136,7 +136,7 @@ WEBHOOK = True ### Redis configuration # A redis server is required for both the Event-Source server or the web-hook # server. -REDIS_HOST = 'localhost' +REDIS_HOST = '127.0.0.1' REDIS_PORT = 6379 REDIS_DB = 0 diff --git a/ansible/roles/pagure-dev/files/pagure.service b/ansible/roles/pagure-dev/files/pagure.service index 623734f..7999bc9 100644 --- a/ansible/roles/pagure-dev/files/pagure.service +++ b/ansible/roles/pagure-dev/files/pagure.service @@ -3,7 +3,8 @@ Description=The Pagure web service After=network.target [Service] -ExecStart=/home/vagrant/.virtualenvs/python2-pagure/bin/python %h/devel/runserver.py -c %h/pagure.cfg --host 0.0.0.0 +Environment="PAGURE_CONFIG=/home/vagrant/pagure.cfg" +ExecStart=/home/vagrant/.virtualenvs/python2-pagure/bin/python %h/devel/runserver.py --host 0.0.0.0 Type=simple [Install] diff --git a/ansible/roles/pagure-dev/files/pagure_ci.service b/ansible/roles/pagure-dev/files/pagure_ci.service new file mode 100644 index 0000000..b9e427a --- /dev/null +++ b/ansible/roles/pagure-dev/files/pagure_ci.service @@ -0,0 +1,13 @@ +[Unit] +Description=Pagure Continuous Integration service +After=redis.target +Documentation=https://pagure.io/pagure + +[Service] +Environment="PAGURE_CONFIG=/home/vagrant/pagure.cfg" +ExecStart=/home/vagrant/.virtualenvs/python2-pagure/bin/python \ + /home/vagrant/devel/pagure-ci/pagure_ci_server.py +Type=simple + +[Install] +WantedBy=multi-user.target diff --git a/ansible/roles/pagure-dev/files/pagure_ev.service b/ansible/roles/pagure-dev/files/pagure_ev.service new file mode 100644 index 0000000..3ee6697 --- /dev/null +++ b/ansible/roles/pagure-dev/files/pagure_ev.service @@ -0,0 +1,13 @@ +[Unit] +Description=Pagure EventSource server (Allowing live refresh of the pages supporting it) +After=redis.target +Documentation=https://pagure.io/pagure + +[Service] +Environment="PAGURE_CONFIG=/home/vagrant/pagure.cfg" +ExecStart=/home/vagrant/.virtualenvs/python2-pagure/bin/python \ + /home/vagrant/devel/ev-server/pagure-stream-server.py +Type=simple + +[Install] +WantedBy=multi-user.target diff --git a/ansible/roles/pagure-dev/files/pagure_webhook.service b/ansible/roles/pagure-dev/files/pagure_webhook.service new file mode 100644 index 0000000..601e296 --- /dev/null +++ b/ansible/roles/pagure-dev/files/pagure_webhook.service @@ -0,0 +1,13 @@ +[Unit] +Description=Pagure WebHook server (Allowing web-hook notifications) +After=redis.target +Documentation=https://pagure.io/pagure + +[Service] +Environment="PAGURE_CONFIG=/home/vagrant/pagure.cfg" +ExecStart=/home/vagrant/.virtualenvs/python2-pagure/bin/python \ + /home/vagrant/devel/webhook-server/pagure-webhook-server.py +Type=simple + +[Install] +WantedBy=multi-user.target diff --git a/ansible/roles/pagure-dev/tasks/main.yml b/ansible/roles/pagure-dev/tasks/main.yml index dd30f47..89d668b 100644 --- a/ansible/roles/pagure-dev/tasks/main.yml +++ b/ansible/roles/pagure-dev/tasks/main.yml @@ -157,3 +157,6 @@ with_items: - pagure.service - pagure-docs.service + - pagure_ci.service + - pagure_ev.service + - pagure_webhook.service